From 7e18a247de62e66d605215afb9d483a03ea0874d Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Wed, 28 Sep 2005 21:48:25 -0700
Subject: [PATCH] --- yaml --- r: 9491 b: refs/heads/master c:
 ed3ffaf7b5e0262cb860f106a6632933671cc88f h: refs/heads/master i:   9489:
 9099da7eced9d97d700e4ec8f07e4651e97b30bf   9487:
 aca130984d4d1dbddd507ca0f129f2962226d6c9 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/sparc64/kernel/traps.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9a773f30bb64..248daafb238e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10147570f9eaff3920f0c67bad7244c2eb958d4f
+refs/heads/master: ed3ffaf7b5e0262cb860f106a6632933671cc88f
diff --git a/trunk/arch/sparc64/kernel/traps.c b/trunk/arch/sparc64/kernel/traps.c
index eeb1e835c423..7f190fc57545 100644
--- a/trunk/arch/sparc64/kernel/traps.c
+++ b/trunk/arch/sparc64/kernel/traps.c
@@ -1333,6 +1333,9 @@ static int cheetah_check_main_memory(unsigned long paddr)
 {
 	unsigned long vaddr = PAGE_OFFSET + paddr;
 
+	if (vaddr > high_memory)
+		return 0;
+
 	return kern_addr_valid(vaddr);
 }