| Message ID | 1448941020-15168-2-git-send-email-aneesh.kumar@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, 2015-01-12 at 03:36:26 UTC, "Aneesh Kumar K.V" wrote: > Acked-by: Scott Wood <scottwood@freescale.com> > Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Entire series applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/26b6a3d9bb48f8b4624a6228 cheers
On Tue, 2015-12-01 at 09:06 +0530, Aneesh Kumar K.V wrote: > Acked-by: Scott Wood <scottwood@freescale.com> > Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> > --- > arch/powerpc/include/asm/{pte-hash32.h => book3s/32/hash.h} | 0 > arch/powerpc/include/asm/{pte-hash64.h => book3s/64/hash.h} | 0 > arch/powerpc/include/asm/pgtable-ppc32.h | 2 +- > arch/powerpc/include/asm/pgtable-ppc64.h | 2 +- > 4 files changed, 2 insertions(+), 2 deletions(-) > rename arch/powerpc/include/asm/{pte-hash32.h => book3s/32/hash.h} (100%) > rename arch/powerpc/include/asm/{pte-hash64.h => book3s/64/hash.h} (100%) Why not pte-hash.h? Balbir Singh.
diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/book3s/32/hash.h similarity index 100% rename from arch/powerpc/include/asm/pte-hash32.h rename to arch/powerpc/include/asm/book3s/32/hash.h diff --git a/arch/powerpc/include/asm/pte-hash64.h b/arch/powerpc/include/asm/book3s/64/hash.h similarity index 100% rename from arch/powerpc/include/asm/pte-hash64.h rename to arch/powerpc/include/asm/book3s/64/hash.h diff --git a/arch/powerpc/include/asm/pgtable-ppc32.h b/arch/powerpc/include/asm/pgtable-ppc32.h index 9c326565d498..1a58a05be99c 100644 --- a/arch/powerpc/include/asm/pgtable-ppc32.h +++ b/arch/powerpc/include/asm/pgtable-ppc32.h @@ -116,7 +116,7 @@ extern int icache_44x_need_flush; #elif defined(CONFIG_8xx) #include <asm/pte-8xx.h> #else /* CONFIG_6xx */ -#include <asm/pte-hash32.h> +#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 3245f2d96d4f..b36a932abdfb 100644 --- a/arch/powerpc/include/asm/pgtable-ppc64.h +++ b/arch/powerpc/include/asm/pgtable-ppc64.h @@ -98,7 +98,7 @@ * Include the PTE bits definitions */ #ifdef CONFIG_PPC_BOOK3S -#include <asm/pte-hash64.h> +#include <asm/book3s/64/hash.h> #else #include <asm/pte-book3e.h> #endif