From c3f5e81e6754e3ddede2083de48ae94b997510bf Mon Sep 17 00:00:00 2001
From: Magnus Damm <magnus@valinux.co.jp>
Date: Sat, 5 Nov 2005 17:25:54 +0100
Subject: [PATCH] --- yaml --- r: 14221 b: refs/heads/master c:
 ffd10a2b77bca50dd05ba26acd5a6e68bcc8f61f h: refs/heads/master i:   14219:
 e28ccf56c4b54180b29aff733ebb1e4d9052e0bb v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86_64/mm/k8topology.c | 1 +
 trunk/arch/x86_64/mm/numa.c       | 2 --
 trunk/arch/x86_64/mm/srat.c       | 4 ----
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index d0b6102e80b4..bc93c57ca9bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e583538f077d5f70191670b47a046ba436ec3428
+refs/heads/master: ffd10a2b77bca50dd05ba26acd5a6e68bcc8f61f
diff --git a/trunk/arch/x86_64/mm/k8topology.c b/trunk/arch/x86_64/mm/k8topology.c
index 65417b040c1b..a5663e0bb01c 100644
--- a/trunk/arch/x86_64/mm/k8topology.c
+++ b/trunk/arch/x86_64/mm/k8topology.c
@@ -108,6 +108,7 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
 		limit >>= 16; 
 		limit <<= 24; 
 		limit |= (1<<24)-1;
+		limit++;
 
 		if (limit > end_pfn << PAGE_SHIFT)
 			limit = end_pfn << PAGE_SHIFT;
diff --git a/trunk/arch/x86_64/mm/numa.c b/trunk/arch/x86_64/mm/numa.c
index edd5559380d3..629ff0621b3d 100644
--- a/trunk/arch/x86_64/mm/numa.c
+++ b/trunk/arch/x86_64/mm/numa.c
@@ -209,8 +209,6 @@ static int numa_emulation(unsigned long start_pfn, unsigned long end_pfn)
  		if (i == numa_fake-1)
  			sz = (end_pfn<<PAGE_SHIFT) - nodes[i].start;
  		nodes[i].end = nodes[i].start + sz;
- 		if (i != numa_fake-1)
- 			nodes[i].end--;
  		printk(KERN_INFO "Faking node %d at %016Lx-%016Lx (%LuMB)\n",
  		       i,
  		       nodes[i].start, nodes[i].end,
diff --git a/trunk/arch/x86_64/mm/srat.c b/trunk/arch/x86_64/mm/srat.c
index c7aa08a58041..33340bd1e328 100644
--- a/trunk/arch/x86_64/mm/srat.c
+++ b/trunk/arch/x86_64/mm/srat.c
@@ -71,8 +71,6 @@ static __init void cutoff_node(int i, unsigned long start, unsigned long end)
 			nd->start = nd->end;
 	}
 	if (nd->end > end) {
-		if (!(end & 0xfff))
-			end--;
 		nd->end = end;
 		if (nd->start > nd->end)
 			nd->start = nd->end;
@@ -166,8 +164,6 @@ acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma)
 		if (nd->end < end)
 			nd->end = end;
 	}
-	if (!(nd->end & 0xfff))
-		nd->end--;
 	printk(KERN_INFO "SRAT: Node %u PXM %u %Lx-%Lx\n", node, pxm,
 	       nd->start, nd->end);
 }