diff options
Diffstat (limited to 'include/asm-x86')
-rw-r--r-- | include/asm-x86/mmzone_64.h | 2 | ||||
-rw-r--r-- | include/asm-x86/page_32.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-x86/mmzone_64.h b/include/asm-x86/mmzone_64.h index 594bd0dc1d08..facde3e5314f 100644 --- a/include/asm-x86/mmzone_64.h +++ b/include/asm-x86/mmzone_64.h | |||
@@ -7,7 +7,7 @@ | |||
7 | 7 | ||
8 | #ifdef CONFIG_NUMA | 8 | #ifdef CONFIG_NUMA |
9 | 9 | ||
10 | #define VIRTUAL_BUG_ON(x) | 10 | #include <linux/mmdebug.h> |
11 | 11 | ||
12 | #include <asm/smp.h> | 12 | #include <asm/smp.h> |
13 | 13 | ||
diff --git a/include/asm-x86/page_32.h b/include/asm-x86/page_32.h index 424e82f8ae27..9159bfb9dcf9 100644 --- a/include/asm-x86/page_32.h +++ b/include/asm-x86/page_32.h | |||
@@ -64,7 +64,8 @@ typedef struct page *pgtable_t; | |||
64 | #endif | 64 | #endif |
65 | 65 | ||
66 | #ifndef __ASSEMBLY__ | 66 | #ifndef __ASSEMBLY__ |
67 | #define __phys_addr(x) ((x) - PAGE_OFFSET) | 67 | #define __phys_addr_const(x) ((x) - PAGE_OFFSET) |
68 | extern unsigned long __phys_addr(unsigned long); | ||
68 | #define __phys_reloc_hide(x) RELOC_HIDE((x), 0) | 69 | #define __phys_reloc_hide(x) RELOC_HIDE((x), 0) |
69 | 70 | ||
70 | #ifdef CONFIG_FLATMEM | 71 | #ifdef CONFIG_FLATMEM |