From 9c68d8b16a6b71762b006751b521c4e301362b29 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <Yinghai.Lu@Sun.COM>
Date: Wed, 30 Jan 2008 13:34:12 +0100
Subject: [PATCH] --- yaml --- r: 80575 b: refs/heads/master c:
 afadcd788f37bfa62d92662e54a720c26c91becf h: refs/heads/master i:   80573:
 69b56e8cc09df57381fee2c53a5320e1b5db95d3   80571:
 aee5a1287ec1d24a060862077a8965bbd0f21816   80567:
 5a4255eacba22aedd0505f3d2c79dbb8b41db149   80559:
 a103bf3aa82d727e426b0a4fb6b88930bce3f6a6   80543:
 e84d42130297de428638dde7994f93c8a757c645   80511:
 aa8bd81ff5f6279dee10df193b03f68d94ccb9c6 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/mm/numa_64.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5d2952179084..1f4fcb83e49d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9198715763e8d0fd7fb7578c07916a5313e28b9d
+refs/heads/master: afadcd788f37bfa62d92662e54a720c26c91becf
diff --git a/trunk/arch/x86/mm/numa_64.c b/trunk/arch/x86/mm/numa_64.c
index f0e5cabe49d8..dc3b1f7e1451 100644
--- a/trunk/arch/x86/mm/numa_64.c
+++ b/trunk/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) {