x86: fix nodemap_size according to nodeid bits

memnode.map is s16 array because of nodeid is 16 bit now.

so need to increase the nodemap_size according to that bits.

Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
index f0e5cabe49d888542f389953b8ac598bb27123ec..dc3b1f7e1451ba46221524860aa0cf54c7e564bb 100644 (file)
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -92,7 +92,7 @@ static int __init allocate_cachealigned_memnodemap(void)
 
        pad = L1_CACHE_BYTES - 1;
        pad_addr = 0x8000;
-       nodemap_size = pad + memnodemapsize;
+       nodemap_size = pad + sizeof(s16) * memnodemapsize;
        nodemap_addr = find_e820_area(pad_addr, end_pfn<<PAGE_SHIFT,
                                      nodemap_size);
        if (nodemap_addr == -1UL) {