tile PCI RC: tilepro conflict with PCI and RAM addresses
Fix a bug in the tilepro PCI resource allocation code that could make the bootmem allocator unhappy if 4GB is installed on mshim 0. Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
This commit is contained in:
Родитель
9bbb08faa9
Коммит
523c178edf
|
@ -614,11 +614,12 @@ static void __init setup_bootmem_allocator_node(int i)
|
||||||
/*
|
/*
|
||||||
* Throw away any memory aliased by the PCI region.
|
* Throw away any memory aliased by the PCI region.
|
||||||
*/
|
*/
|
||||||
if (pci_reserve_start_pfn < end && pci_reserve_end_pfn > start)
|
if (pci_reserve_start_pfn < end && pci_reserve_end_pfn > start) {
|
||||||
reserve_bootmem(PFN_PHYS(pci_reserve_start_pfn),
|
start = max(pci_reserve_start_pfn, start);
|
||||||
PFN_PHYS(pci_reserve_end_pfn -
|
end = min(pci_reserve_end_pfn, end);
|
||||||
pci_reserve_start_pfn),
|
reserve_bootmem(PFN_PHYS(start), PFN_PHYS(end - start),
|
||||||
BOOTMEM_EXCLUSIVE);
|
BOOTMEM_EXCLUSIVE);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче