| Message ID | 1448274160-28446-5-git-send-email-aneesh.kumar@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On 11/23/2015 03:52 PM, Aneesh Kumar K.V wrote: > Keep it seperate to make rebasing easier This is confusing considering the fact that we are in between some renaming/moving of header files, changing the references they had before and so on. Could you please elaborate a bit about what kind of changes this patch has and their purpose. Also if the movement involves multiple parts (like this one), it will be better to have detailed descriptions about each step in the commit message of the first patch itself to see how its being organized in the subsequent patches. > > Acked-by: Scott Wood <scottwood@freescale.com> > Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> > --- > arch/powerpc/include/asm/book3s/32/pgtable.h | 4 ++-- > arch/powerpc/include/asm/book3s/64/pgtable.h | 6 +++--- > arch/powerpc/include/asm/pgtable-ppc32.h | 2 -- > arch/powerpc/include/asm/pgtable-ppc64.h | 4 ---- > 4 files changed, 5 insertions(+), 11 deletions(-) > > diff --git a/arch/powerpc/include/asm/book3s/32/pgtable.h b/arch/powerpc/include/asm/book3s/32/pgtable.h > index 1a58a05be99c..a7738dfbe7e5 100644 > --- a/arch/powerpc/include/asm/book3s/32/pgtable.h > +++ b/arch/powerpc/include/asm/book3s/32/pgtable.h > @@ -1,5 +1,5 @@ > -#ifndef _ASM_POWERPC_PGTABLE_PPC32_H > -#define _ASM_POWERPC_PGTABLE_PPC32_H > +#ifndef _ASM_POWERPC_BOOK3S_32_PGTABLE_H > +#define _ASM_POWERPC_BOOK3S_32_PGTABLE_H I guess this is missing here. -#endif /* _ASM_POWERPC_PGTABLE_PPC32_H */ +#endif /* _ASM_POWERPC_BOOK3S_32_PGTABLE_H */
diff --git a/arch/powerpc/include/asm/book3s/32/pgtable.h b/arch/powerpc/include/asm/book3s/32/pgtable.h index 1a58a05be99c..a7738dfbe7e5 100644 --- a/arch/powerpc/include/asm/book3s/32/pgtable.h +++ b/arch/powerpc/include/asm/book3s/32/pgtable.h @@ -1,5 +1,5 @@ -#ifndef _ASM_POWERPC_PGTABLE_PPC32_H -#define _ASM_POWERPC_PGTABLE_PPC32_H +#ifndef _ASM_POWERPC_BOOK3S_32_PGTABLE_H +#define _ASM_POWERPC_BOOK3S_32_PGTABLE_H #include <asm-generic/pgtable-nopmd.h> diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h index 4c61db6adcde..cdd5284d9eaa 100644 --- a/arch/powerpc/include/asm/book3s/64/pgtable.h +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h @@ -1,5 +1,5 @@ -#ifndef _ASM_POWERPC_PGTABLE_PPC64_H_ -#define _ASM_POWERPC_PGTABLE_PPC64_H_ +#ifndef _ASM_POWERPC_BOOK3S_64_PGTABLE_H_ +#define _ASM_POWERPC_BOOK3S_64_PGTABLE_H_ /* * This file contains the functions and defines necessary to modify and use * the ppc64 hashed page table. @@ -623,4 +623,4 @@ static inline int pmd_move_must_withdraw(struct spinlock *new_pmd_ptl, return true; } #endif /* __ASSEMBLY__ */ -#endif /* _ASM_POWERPC_PGTABLE_PPC64_H_ */ +#endif /* _ASM_POWERPC_BOOK3S_64_PGTABLE_H_ */ diff --git a/arch/powerpc/include/asm/pgtable-ppc32.h b/arch/powerpc/include/asm/pgtable-ppc32.h index 1a58a05be99c..aac6547b0823 100644 --- a/arch/powerpc/include/asm/pgtable-ppc32.h +++ b/arch/powerpc/include/asm/pgtable-ppc32.h @@ -115,8 +115,6 @@ extern int icache_44x_need_flush; #include <asm/pte-fsl-booke.h> #elif defined(CONFIG_8xx) #include <asm/pte-8xx.h> -#else /* CONFIG_6xx */ -#include <asm/book3s/32/hash.h> #endif /* And here we include common definitions */ diff --git a/arch/powerpc/include/asm/pgtable-ppc64.h b/arch/powerpc/include/asm/pgtable-ppc64.h index b36a932abdfb..1ef0fea32e1e 100644 --- a/arch/powerpc/include/asm/pgtable-ppc64.h +++ b/arch/powerpc/include/asm/pgtable-ppc64.h @@ -97,11 +97,7 @@ /* * Include the PTE bits definitions */ -#ifdef CONFIG_PPC_BOOK3S -#include <asm/book3s/64/hash.h> -#else #include <asm/pte-book3e.h> -#endif #include <asm/pte-common.h> #ifdef CONFIG_PPC_MM_SLICES