[PATCH 26/35] x86: Put 64 bit numa node memmap above 16M
in [Kernel]
|
Prev: [PATCH 34/35] x86: Use walk_system_ream_range() instead of referring e820.map directly for tboot
Next: [PATCH 14/35] x86, lmb: Add lmb_memory_size()
From: Yinghai Lu on 13 May 2010 20:30 Do not use 0x8000 hard code value anymore. Signed-off-by: Yinghai Lu <yinghai(a)kernel.org> --- arch/x86/mm/numa_64.c | 2 +- arch/x86/mm/srat_64.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index 18d2296..b8438ac 100644 --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c @@ -88,7 +88,7 @@ static int __init allocate_cachealigned_memnodemap(void) if (memnodemapsize <= ARRAY_SIZE(memnode.embedded_map)) return 0; - addr = 0x8000; + addr = __pa(MAX_DMA_ADDRESS); nodemap_size = roundup(sizeof(s16) * memnodemapsize, L1_CACHE_BYTES); nodemap_addr = lmb_find_area(addr, max_pfn<<PAGE_SHIFT, nodemap_size, L1_CACHE_BYTES); diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c index 23f274c..c206b08 100644 --- a/arch/x86/mm/srat_64.c +++ b/arch/x86/mm/srat_64.c @@ -99,8 +99,8 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit) unsigned long phys; length = slit->header.length; - phys = lmb_find_area(0, max_pfn_mapped<<PAGE_SHIFT, length, - PAGE_SIZE); + phys = lmb_find_area(__pa(MAX_DMA_ADDRESS), max_pfn_mapped<<PAGE_SHIFT, + length, PAGE_SIZE); if (phys == -1L) panic(" Can not save slit!\n"); -- 1.6.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |