From a2cfaa5332c0244902c3dc41c1396eeb6fe3088b Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Fri, 8 May 2009 00:36:44 -0700
Subject: [PATCH] --- yaml --- r: 145778 b: refs/heads/master c:
 b37ab91907e9002925f4217e3bbd496aa12c2fa3 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a4892434dba3..3f0c84090b2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80989ce0643c1034822f3e339ed8d790b649abe1
+refs/heads/master: b37ab91907e9002925f4217e3bbd496aa12c2fa3
diff --git a/trunk/arch/x86/mm/srat_64.c b/trunk/arch/x86/mm/srat_64.c
index 01765955baaf..c7a18aaccf8d 100644
--- a/trunk/arch/x86/mm/srat_64.c
+++ b/trunk/arch/x86/mm/srat_64.c
@@ -345,7 +345,7 @@ static int __init nodes_cover_memory(const struct bootnode *nodes)
 			pxmram = 0;
 	}
 
-	e820ram = max_pfn - absent_pages_in_range(0, max_pfn);
+	e820ram = max_pfn - (e820_hole_size(0, max_pfn<<PAGE_SHIFT)>>PAGE_SHIFT);
 	/* We seem to lose 3 pages somewhere. Allow a bit of slack. */
 	if ((long)(e820ram - pxmram) >= 1*1024*1024) {
 		printk(KERN_ERR