---

yaml --- r: 9491 b: refs/heads/master c: ed3ffaf h: refs/heads/master i: 9489: 9099da7 9487: aca1309 v: v3
git-mirror · Sep 29, 2005 · 7e18a24 · 7e18a24
1 parent b870e0a
commit 7e18a24
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);
 }