aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-02-09 00:15:06 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 15:37:13 -0800
commit3bf8f5a92cd4b04e3f1e162a1b4b99759a882b5d (patch)
treee6fb614454de838591dcd757f1c02198bf9ad294 /include
parentf0e2dcffae8701f00b34bce90e762eb798dea5b1 (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>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/page_32.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-x86/page_32.h b/include/asm-x86/page_32.h
index ba715d9798b..984998a3074 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;
typedef union { pteval_t pte, pte_low; } pte_t;
typedef pte_t boot_pte_t;
-typedef struct page *pgtable_t;
-
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_X86_PAE */
+#ifndef __ASSEMBLY__
+typedef struct page *pgtable_t;
+#endif
+
#ifdef CONFIG_HUGETLB_PAGE
#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
#endif