commit af5c2bd16ac2e5688c3bf46ea1f95112d696d294
author Vegard Nossum <vegard.nossum@gmail.com> Fri Oct 03 17:54:25 2008 +0200
committer Ingo Molnar <mingo@elte.hu> Mon Oct 13 10:33:15 2008 +0200
tree 80e08edc5c93999f083039a81b65fbf05d47954b
parent 7f2f49a58283110083a7358d2d98025a11653373

x86: fix virt_addr_valid() with CONFIG_DEBUG_VIRTUAL=y, v2

virt_addr_valid() calls __pa(), which calls __phys_addr(). With
CONFIG_DEBUG_VIRTUAL=y, __phys_addr() will kill the kernel if the
address *isn't* valid. That's clearly wrong for virt_addr_valid().

We also incorporate the debugging checks into virt_addr_valid().

Signed-off-by: Vegard Nossum <vegardno@ben.ifi.uio.no>
Acked-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

include/asm-x86/page_32.h

diff --git a/include/asm-x86/page_32.h b/include/asm-x86/page_32.h
index 9c5a737..5d6a68a 100644
--- a/include/asm-x86/page_32.h
+++ b/include/asm-x86/page_32.h
@@ -73,11 +73,11 @@
 #endif
 
 #ifndef __ASSEMBLY__
-#define __phys_addr_const(x)	((x) - PAGE_OFFSET)
+#define __phys_addr_nodebug(x)	((x) - PAGE_OFFSET)
 #ifdef CONFIG_DEBUG_VIRTUAL
 extern unsigned long __phys_addr(unsigned long);
 #else
-#define __phys_addr(x)		((x) - PAGE_OFFSET)
+#define __phys_addr(x)		__phys_addr_nodebug(x)
 #endif
 #define __phys_reloc_hide(x)	RELOC_HIDE((x), 0)