From 51e3469f6813d38ca57b310299f1efe6ecfe70db Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Thu, 16 Feb 2006 23:42:13 +0100
Subject: [PATCH] --- yaml --- r: 20423 b: refs/heads/master c:
 fdb9df942437c6c5d1a6928d5fff824466c3af67 h: refs/heads/master i:   20421:
 e8fcc8e65e6dcac014fe5e4f475a1036724a1c4e   20419:
 51331bb20792623bfec085b4283134cf4872744f   20415:
 85915e1e2a94b191363de1c04ffee2232f6cbd0d v: v3

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

diff --git a/[refs] b/[refs]
index 1cbcffdf68f1..1341f89592aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6574ffd74b03e35026f428a2c820e6ddf45d426c
+refs/heads/master: fdb9df942437c6c5d1a6928d5fff824466c3af67
diff --git a/trunk/arch/x86_64/mm/srat.c b/trunk/arch/x86_64/mm/srat.c
index cd25300726fc..809dc70675f7 100644
--- a/trunk/arch/x86_64/mm/srat.c
+++ b/trunk/arch/x86_64/mm/srat.c
@@ -228,7 +228,8 @@ static int nodes_cover_memory(void)
 	}
 
 	e820ram = end_pfn - e820_hole_size(0, end_pfn);
-	if (pxmram < e820ram) {
+	/* We seem to lose 3 pages somewhere. Allow a bit of slack. */
+	if ((long)(e820ram - pxmram) >= 1*1024*1024) {
 		printk(KERN_ERR
 	"SRAT: PXMs only cover %luMB of your %luMB e820 RAM. Not used.\n",
 			(pxmram << PAGE_SHIFT) >> 20,