diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-02-08 18:15:06 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 18:37:13 -0500 |
commit | 3bf8f5a92cd4b04e3f1e162a1b4b99759a882b5d (patch) | |
tree | e6fb614454de838591dcd757f1c02198bf9ad294 | |
parent | f0e2dcffae8701f00b34bce90e762eb798dea5b1 (diff) |
x86: fix pgtable_t build breakage
Commit 2f569afd9ced9ebec9a6eb3dbf6f83429be0a7b4 ("CONFIG_HIGHPTE vs.
sub-page page tables") caused some build breakage due to pgtable_t only
getting declared in the CONFIG_X86_PAE case.
Move the declaration outside the PAE section.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/asm-x86/page_32.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-x86/page_32.h b/include/asm-x86/page_32.h index ba715d9798b0..984998a30741 100644 --- a/include/asm-x86/page_32.h +++ b/include/asm-x86/page_32.h | |||
@@ -50,11 +50,13 @@ typedef unsigned long phys_addr_t; | |||
50 | typedef union { pteval_t pte, pte_low; } pte_t; | 50 | typedef union { pteval_t pte, pte_low; } pte_t; |
51 | typedef pte_t boot_pte_t; | 51 | typedef pte_t boot_pte_t; |
52 | 52 | ||
53 | typedef struct page *pgtable_t; | ||
54 | |||
55 | #endif /* __ASSEMBLY__ */ | 53 | #endif /* __ASSEMBLY__ */ |
56 | #endif /* CONFIG_X86_PAE */ | 54 | #endif /* CONFIG_X86_PAE */ |
57 | 55 | ||
56 | #ifndef __ASSEMBLY__ | ||
57 | typedef struct page *pgtable_t; | ||
58 | #endif | ||
59 | |||
58 | #ifdef CONFIG_HUGETLB_PAGE | 60 | #ifdef CONFIG_HUGETLB_PAGE |
59 | #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA | 61 | #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA |
60 | #endif | 62 | #endif |