Commit 3dfcb315 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman

powerpc/mm: make a separate copy for book3s

In this patch we do:
cp pgtable-ppc32.h book3s/32/pgtable.h
cp pgtable-ppc64.h book3s/64/pgtable.h

This enable us to do further changes to hash specific config.
We will change the page table format for 64bit hash in later patches.
Acked-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 26b6a3d9
This diff is collapsed.
This diff is collapsed.
#ifndef _ASM_POWERPC_BOOK3S_PGTABLE_H
#define _ASM_POWERPC_BOOK3S_PGTABLE_H
#ifdef CONFIG_PPC64
#include <asm/book3s/64/pgtable.h>
#else
#include <asm/book3s/32/pgtable.h>
#endif
#endif
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
* need for various slices related matters. Note that this isn't the * need for various slices related matters. Note that this isn't the
* complete pgtable.h but only a portion of it. * complete pgtable.h but only a portion of it.
*/ */
#include <asm/pgtable-ppc64.h> #include <asm/book3s/64/pgtable.h>
#include <asm/bug.h> #include <asm/bug.h>
#include <asm/processor.h> #include <asm/processor.h>
......
...@@ -115,8 +115,6 @@ extern int icache_44x_need_flush; ...@@ -115,8 +115,6 @@ extern int icache_44x_need_flush;
#include <asm/pte-fsl-booke.h> #include <asm/pte-fsl-booke.h>
#elif defined(CONFIG_8xx) #elif defined(CONFIG_8xx)
#include <asm/pte-8xx.h> #include <asm/pte-8xx.h>
#else /* CONFIG_6xx */
#include <asm/book3s/32/hash.h>
#endif #endif
/* And here we include common definitions */ /* And here we include common definitions */
......
...@@ -97,11 +97,7 @@ ...@@ -97,11 +97,7 @@
/* /*
* Include the PTE bits definitions * Include the PTE bits definitions
*/ */
#ifdef CONFIG_PPC_BOOK3S
#include <asm/book3s/64/hash.h>
#else
#include <asm/pte-book3e.h> #include <asm/pte-book3e.h>
#endif
#include <asm/pte-common.h> #include <asm/pte-common.h>
#ifdef CONFIG_PPC_MM_SLICES #ifdef CONFIG_PPC_MM_SLICES
......
...@@ -13,11 +13,15 @@ struct mm_struct; ...@@ -13,11 +13,15 @@ struct mm_struct;
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
#ifdef CONFIG_PPC_BOOK3S
#include <asm/book3s/pgtable.h>
#else
#if defined(CONFIG_PPC64) #if defined(CONFIG_PPC64)
# include <asm/pgtable-ppc64.h> # include <asm/pgtable-ppc64.h>
#else #else
# include <asm/pgtable-ppc32.h> # include <asm/pgtable-ppc32.h>
#endif #endif
#endif /* !CONFIG_PPC_BOOK3S */
/* /*
* We save the slot number & secondary bit in the second half of the * We save the slot number & secondary bit in the second half of the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment