---

yaml --- r: 20423 b: refs/heads/master c: fdb9df9 h: refs/heads/master i: 20421: e8fcc8e 20419: 51331bb 20415: 85915e1 v: v3
git-mirror · Feb 17, 2006 · 51e3469 · 51e3469
1 parent e235479
commit 51e3469
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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,