diff options
Diffstat (limited to 'include/asm-x86/page_32.h')
-rw-r--r-- | include/asm-x86/page_32.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/asm-x86/page_32.h b/include/asm-x86/page_32.h index 5f7257fd589b..424e82f8ae27 100644 --- a/include/asm-x86/page_32.h +++ b/include/asm-x86/page_32.h | |||
@@ -47,7 +47,10 @@ typedef unsigned long pgdval_t; | |||
47 | typedef unsigned long pgprotval_t; | 47 | typedef unsigned long pgprotval_t; |
48 | typedef unsigned long phys_addr_t; | 48 | typedef unsigned long phys_addr_t; |
49 | 49 | ||
50 | typedef union { pteval_t pte, pte_low; } pte_t; | 50 | typedef union { |
51 | pteval_t pte; | ||
52 | pteval_t pte_low; | ||
53 | } pte_t; | ||
51 | 54 | ||
52 | #endif /* __ASSEMBLY__ */ | 55 | #endif /* __ASSEMBLY__ */ |
53 | #endif /* CONFIG_X86_PAE */ | 56 | #endif /* CONFIG_X86_PAE */ |
@@ -61,7 +64,7 @@ typedef struct page *pgtable_t; | |||
61 | #endif | 64 | #endif |
62 | 65 | ||
63 | #ifndef __ASSEMBLY__ | 66 | #ifndef __ASSEMBLY__ |
64 | #define __phys_addr(x) ((x)-PAGE_OFFSET) | 67 | #define __phys_addr(x) ((x) - PAGE_OFFSET) |
65 | #define __phys_reloc_hide(x) RELOC_HIDE((x), 0) | 68 | #define __phys_reloc_hide(x) RELOC_HIDE((x), 0) |
66 | 69 | ||
67 | #ifdef CONFIG_FLATMEM | 70 | #ifdef CONFIG_FLATMEM |
@@ -78,7 +81,7 @@ extern unsigned int __VMALLOC_RESERVE; | |||
78 | extern int sysctl_legacy_va_layout; | 81 | extern int sysctl_legacy_va_layout; |
79 | 82 | ||
80 | #define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE) | 83 | #define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE) |
81 | #define MAXMEM (-__PAGE_OFFSET-__VMALLOC_RESERVE) | 84 | #define MAXMEM (-__PAGE_OFFSET - __VMALLOC_RESERVE) |
82 | 85 | ||
83 | #ifdef CONFIG_X86_USE_3DNOW | 86 | #ifdef CONFIG_X86_USE_3DNOW |
84 | #include <asm/mmx.h> | 87 | #include <asm/mmx.h> |