From 298230c2738391ffedceb5deb6210bba37e45e20 Mon Sep 17 00:00:00 2001
From: Roland Dreier <rdreier@cisco.com>
Date: Mon, 15 Sep 2008 10:43:35 +0000
Subject: [PATCH] --- yaml --- r: 114589 b: refs/heads/master c:
 a880e7623397bcb44877b012cd65baa11ad1bbf8 h: refs/heads/master i:   114587:
 892d81f398e2e4138ccd46e9a18ba5c2176ab1f3 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/powerpc/mm/mem.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4b05d685b5b2..1a400d20467a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ddc9d3200c25edddd7051f208dbbdd8e16f0734
+refs/heads/master: a880e7623397bcb44877b012cd65baa11ad1bbf8
diff --git a/trunk/arch/powerpc/mm/mem.c b/trunk/arch/powerpc/mm/mem.c
index 1c93c255873b..98d7bf99533a 100644
--- a/trunk/arch/powerpc/mm/mem.c
+++ b/trunk/arch/powerpc/mm/mem.c
@@ -75,11 +75,10 @@ static inline pte_t *virt_to_kpte(unsigned long vaddr)
 
 int page_is_ram(unsigned long pfn)
 {
-	unsigned long paddr = (pfn << PAGE_SHIFT);
-
 #ifndef CONFIG_PPC64	/* XXX for now */
-	return paddr < __pa(high_memory);
+	return pfn < max_pfn;
 #else
+	unsigned long paddr = (pfn << PAGE_SHIFT);
 	int i;
 	for (i=0; i < lmb.memory.cnt; i++) {
 		unsigned long base;