From 01d68d7587ac9563f5c2bc5ef4d4db11cfc995be Mon Sep 17 00:00:00 2001
From: Amul Shah <amul.shah@unisys.com>
Date: Tue, 13 Feb 2007 13:26:20 +0100
Subject: [PATCH] --- yaml --- r: 48399 b: refs/heads/master c:
 54413927f022292aeccadd268fbf1c0b42129945 h: refs/heads/master i:   48397:
 0d8915bae5e648bc36633b06bbab472564b73b56   48395:
 a5fab014439ddd4a441e4f4299f470c730c5b38c   48391:
 6f1ce9ddce08f5421a03a31bb0d74b29bc5ce222   48383:
 d4416ff7482193756914f0c6f95947846c8c058f v: v3

---
 [refs]                      |  2 +-
 trunk/arch/x86_64/mm/numa.c | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 220db74ed936..ce64b06d1f25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 076422d2af7e3d8e72c6e70843f6ea377714b082
+refs/heads/master: 54413927f022292aeccadd268fbf1c0b42129945
diff --git a/trunk/arch/x86_64/mm/numa.c b/trunk/arch/x86_64/mm/numa.c
index 7d9c428f4094..1ec16ea97519 100644
--- a/trunk/arch/x86_64/mm/numa.c
+++ b/trunk/arch/x86_64/mm/numa.c
@@ -78,11 +78,8 @@ static int __init allocate_cachealigned_memnodemap(void)
 	unsigned long pad, pad_addr;
 
 	memnodemap = memnode.embedded_map;
-	if (memnodemapsize <= 48) {
-		printk(KERN_DEBUG "NUMA: Allocated memnodemap from %lx - %lx\n",
-		       nodemap_addr, nodemap_addr + nodemap_size);
+	if (memnodemapsize <= 48)
 		return 0;
-	}
 
 	pad = L1_CACHE_BYTES - 1;
 	pad_addr = 0x8000;
@@ -110,7 +107,7 @@ static int __init allocate_cachealigned_memnodemap(void)
 static int __init
 extract_lsb_from_nodes (const struct bootnode *nodes, int numnodes)
 {
-	int i;
+	int i, nodes_used = 0;
 	unsigned long start, end;
 	unsigned long bitfield = 0, memtop = 0;
 
@@ -119,11 +116,15 @@ extract_lsb_from_nodes (const struct bootnode *nodes, int numnodes)
 		end = nodes[i].end;
 		if (start >= end)
 			continue;
-		bitfield |= start | end;
+		bitfield |= start;
+		nodes_used++;
 		if (end > memtop)
 			memtop = end;
 	}
-	i = find_first_bit(&bitfield, sizeof(unsigned long)*8);
+	if (nodes_used <= 1)
+		i = 63;
+	else
+		i = find_first_bit(&bitfield, sizeof(unsigned long)*8);
 	memnodemapsize = (memtop >> i)+1;
 	return i;
 }