powerpc/mm: Fix misplaced #endif in pgtable-ppc64-64k.h
PATCH 1/20 powerpc/mm: Fix misplaced #endif in pgtable-ppc64-64k.h
A misplaced #endif causes more definitions than intended to be protected by #ifndef __ASSEMBLY__. This breaks upcoming 64-bit BookE support patch when using 64k pages.
Signed-off-by Benjamin Herrenschmidt <[email protected]>
---
arch/powerpc/include/asm/pgtable-ppc64-64k.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/powerpc/include/asm/pgtable-ppc64-64k.h +1 -3
@@ -10,10 +10,10 @@#define PGD_INDEX_SIZE 4#ifndef __ASSEMBLY__ -#define PTE_TABLE_SIZE (sizeof(real_pte_t) << PTE_INDEX_SIZE)#define PMD_TABLE_SIZE (sizeof(pmd_t) << PMD_INDEX_SIZE)#define PGD_TABLE_SIZE (sizeof(pgd_t) << PGD_INDEX_SIZE) +#endif /* __ASSEMBLY__ */ #define PTRS_PER_PTE (1 << PTE_INDEX_SIZE)#define PTRS_PER_PMD (1 << PMD_INDEX_SIZE)
@@ -32,8 +32,6 @@#define PGDIR_SIZE (1UL << PGDIR_SHIFT)#define PGDIR_MASK (~(PGDIR_SIZE-1)) -#endif /* __ASSEMBLY__ */ -/* Bits to mask out from a PMD to get to the PTE page */ #define PMD_MASKED_BITS 0x1ff/* Bits to mask out from a PGD/PUD to get to the PMD page */