@@ -1,5 +1,5 @@
-#ifndef _ASM_POWERPC_PGTABLE_PPC32_H
-#define _ASM_POWERPC_PGTABLE_PPC32_H
+#ifndef _ASM_POWERPC_BOOKE_32_PGTABLE_H
+#define _ASM_POWERPC_BOOKE_32_PGTABLE_H
#include <asm-generic/pgtable-nopmd.h>
@@ -106,15 +106,15 @@ extern int icache_44x_need_flush;
*/
#if defined(CONFIG_40x)
-#include <asm/pte-40x.h>
+#include <asm/booke/32/pte-40x.h>
#elif defined(CONFIG_44x)
-#include <asm/pte-44x.h>
+#include <asm/booke/32/pte-44x.h>
#elif defined(CONFIG_FSL_BOOKE) && defined(CONFIG_PTE_64BIT)
-#include <asm/pte-book3e.h>
+#include <asm/booke/pte-book3e.h>
#elif defined(CONFIG_FSL_BOOKE)
-#include <asm/pte-fsl-booke.h>
+#include <asm/booke/32/pte-fsl-booke.h>
#elif defined(CONFIG_8xx)
-#include <asm/pte-8xx.h>
+#include <asm/booke/32/pte-8xx.h>
#endif
/* And here we include common definitions */
@@ -340,4 +340,4 @@ extern int get_pteptr(struct mm_struct *mm, unsigned long addr, pte_t **ptep,
#endif /* !__ASSEMBLY__ */
-#endif /* _ASM_POWERPC_PGTABLE_PPC32_H */
+#endif /* __ASM_POWERPC_BOOKE_32_PGTABLE_H */
similarity index 100%
rename from arch/powerpc/include/asm/pte-40x.h
rename to arch/powerpc/include/asm/booke/32/pte-40x.h
similarity index 100%
rename from arch/powerpc/include/asm/pte-44x.h
rename to arch/powerpc/include/asm/booke/32/pte-44x.h
similarity index 100%
rename from arch/powerpc/include/asm/pte-8xx.h
rename to arch/powerpc/include/asm/booke/32/pte-8xx.h
similarity index 100%
rename from arch/powerpc/include/asm/pte-fsl-booke.h
rename to arch/powerpc/include/asm/booke/32/pte-fsl-booke.h
@@ -97,7 +97,7 @@
/*
* Include the PTE bits definitions
*/
-#include <asm/pte-book3e.h>
+#include <asm/booke/pte-book3e.h>
#include <asm/pte-common.h>
#ifdef CONFIG_PPC_MM_SLICES
similarity index 100%
rename from arch/powerpc/include/asm/pte-book3e.h
rename to arch/powerpc/include/asm/booke/pte-book3e.h
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> --- arch/powerpc/include/asm/booke/32/pgtable.h | 16 ++++++++-------- arch/powerpc/include/asm/{ => booke/32}/pte-40x.h | 0 arch/powerpc/include/asm/{ => booke/32}/pte-44x.h | 0 arch/powerpc/include/asm/{ => booke/32}/pte-8xx.h | 0 arch/powerpc/include/asm/{ => booke/32}/pte-fsl-booke.h | 0 arch/powerpc/include/asm/booke/64/pgtable.h | 2 +- arch/powerpc/include/asm/{ => booke}/pte-book3e.h | 0 7 files changed, 9 insertions(+), 9 deletions(-) rename arch/powerpc/include/asm/{ => booke/32}/pte-40x.h (100%) rename arch/powerpc/include/asm/{ => booke/32}/pte-44x.h (100%) rename arch/powerpc/include/asm/{ => booke/32}/pte-8xx.h (100%) rename arch/powerpc/include/asm/{ => booke/32}/pte-fsl-booke.h (100%) rename arch/powerpc/include/asm/{ => booke}/pte-book3e.h (100%)