From: Yinghai Lu <Yinghai.Lu@Sun.COM>
Date: Wed, 30 Jan 2008 12:34:12 +0000 (+0100)
Subject: x86: fix nodemap_size according to nodeid bits
X-Git-Tag: v2.6.25-rc1~1143^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=afadcd788f37bfa62d92662e54a720c26c91becf;p=linux-2.6-omap-h63xx.git

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 f0e5cabe49d..dc3b1f7e145 100644
--- 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) {