tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by Ingo Molnar and committed by Linus Torvalds 3bf8f5a9 f0e2dcff

+4 -2
unified split
+4 -2
include/asm-x86/page_32.h
··· 50 typedef union { pteval_t pte, pte_low; } pte_t; 51 typedef pte_t boot_pte_t; 52 53 - typedef struct page *pgtable_t; 54 - 55 #endif /* __ASSEMBLY__ */ 56 #endif /* CONFIG_X86_PAE */ 57 58 #ifdef CONFIG_HUGETLB_PAGE 59 #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
··· 50 typedef union { pteval_t pte, pte_low; } pte_t; 51 typedef pte_t boot_pte_t; 52 53 #endif /* __ASSEMBLY__ */ 54 #endif /* CONFIG_X86_PAE */ 55 + 56 + #ifndef __ASSEMBLY__ 57 + typedef struct page *pgtable_t; 58 + #endif 59 60 #ifdef CONFIG_HUGETLB_PAGE 61 #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA