]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
x86: fix pgtable_t build breakage
authorIngo Molnar <mingo@elte.hu>
Fri, 8 Feb 2008 23:15:06 +0000 (00:15 +0100)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 8 Feb 2008 23:37:13 +0000 (15:37 -0800)
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>
include/asm-x86/page_32.h

index ba715d9798b093aeee1a50aecf5373caf8930835..984998a30741c0a604faaa36b217cbc957a04e55 100644 (file)
@@ -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