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

[karo-tx-linux.git] / include / asm-x86 / page_32.h

diff --git a/include/asm-x86/page_32.h b/include/asm-x86/page_32.h
index 9c5a737a9af9878ee128d15a90505afd6f733737..5d6a68a1067ac90bb32a4008b026fd6c87c59e6c 100644 (file)
--- a/include/asm-x86/page_32.h
+++ b/include/asm-x86/page_32.h
@@ -73,11 +73,11 @@ typedef struct page *pgtable_t;
 #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)