From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
To: benh@kernel.crashing.org, paulus@samba.org, mpe@ellerman.id.au,
Scott Wood <scottwood@freescale.com>
Cc: linuxppc-dev@lists.ozlabs.org,
"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Subject: [PATCH v3 04/31] powerpc/mm: make a separate copy for book3s (part 2)
Date: Tue, 13 Oct 2015 00:09:48 +0530 [thread overview]
Message-ID: <1444675215-19484-5-git-send-email-aneesh.kumar@linux.vnet.ibm.com> (raw)
In-Reply-To: <1444675215-19484-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com>
Keep it separate to make rebasing easier
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
#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
--
2.5.0
next prev parent reply other threads:[~2015-10-12 18:40 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-12 18:39 [PATCH v3 00/31] powerpc/mm: Update page table format for book3s 64 Aneesh Kumar K.V
2015-10-12 18:39 ` [PATCH v3 01/31] powerpc/mm: move pte headers to book3s directory Aneesh Kumar K.V
2015-10-12 18:39 ` [PATCH v3 02/31] powerpc/mm: move pte headers to book3s directory (part 2) Aneesh Kumar K.V
2015-10-12 18:39 ` [PATCH v3 03/31] powerpc/mm: make a separate copy for book3s Aneesh Kumar K.V
2015-10-12 18:39 ` Aneesh Kumar K.V [this message]
2015-10-12 18:39 ` [PATCH v3 05/31] powerpc/mm: Move hash specific pte width and other defines to book3s Aneesh Kumar K.V
2015-10-12 18:39 ` [PATCH v3 06/31] powerpc/mm: Delete booke bits from book3s Aneesh Kumar K.V
2015-10-12 18:39 ` [PATCH v3 07/31] powerpc/mm: Don't have generic headers introduce functions touching pte bits Aneesh Kumar K.V
2015-10-12 18:39 ` [PATCH v3 08/31] powerpc/mm: Drop pte-common.h from BOOK3S 64 Aneesh Kumar K.V
2015-10-12 18:39 ` [PATCH v3 09/31] powerpc/mm: Don't use pte_val as lvalue Aneesh Kumar K.V
2015-10-12 18:39 ` [PATCH v3 10/31] powerpc/mm: Don't use pmd_val, pud_val and pgd_val " Aneesh Kumar K.V
2015-10-13 5:10 ` [PATCH v3 10/31] powerpc/mm: Don't use pmd_val,pud_val " Michael Ellerman
2015-10-13 5:17 ` [PATCH v3 10/31] powerpc/mm: Don't use pmd_val, pud_val " Aneesh Kumar K.V
2015-10-13 5:23 ` Aneesh Kumar K.V
2015-10-13 5:31 ` [PATCH v3 10/31] powerpc/mm: Don't use pmd_val,pud_val " Michael Ellerman
2015-10-13 9:26 ` Michael Ellerman
2015-10-12 18:39 ` [PATCH v3 11/31] powerpc/mm: Move hash64 PTE bits from book3s/64/pgtable.h to hash.h Aneesh Kumar K.V
2015-10-12 18:39 ` [PATCH v3 12/31] powerpc/mm: Move PTE bits from generic functions to hash64 functions Aneesh Kumar K.V
2015-10-12 18:39 ` [PATCH v3 13/31] powerpc/booke: Move nohash headers (part 1) Aneesh Kumar K.V
2015-10-12 18:39 ` [PATCH v3 14/31] powerpc/booke: Move nohash headers (part 2) Aneesh Kumar K.V
2015-10-12 18:39 ` [PATCH v3 15/31] powerpc/booke: Move nohash headers (part 3) Aneesh Kumar K.V
2015-10-12 18:40 ` [PATCH v3 16/31] powerpc/booke: Move nohash headers (part 4) Aneesh Kumar K.V
2015-10-12 18:40 ` [PATCH v3 17/31] powerpc/booke: Move nohash headers (part 5) Aneesh Kumar K.V
2015-10-12 18:40 ` [PATCH v3 18/31] powerpc/mm: Increase the pte frag size Aneesh Kumar K.V
2015-10-12 18:40 ` [PATCH v3 19/31] powerpc/mm: Convert 4k hash insert to C Aneesh Kumar K.V
2015-10-12 18:40 ` [PATCH v3 20/31] powerpc/mm: update __real_pte to take address as argument Aneesh Kumar K.V
2015-10-12 18:40 ` [PATCH v3 21/31] powerpc/mm: make pte page hash index slot 8 bits Aneesh Kumar K.V
2015-10-12 18:40 ` [PATCH v3 22/31] powerpc/mm: Don't track subpage valid bit in pte_t Aneesh Kumar K.V
2015-10-12 18:40 ` [PATCH v3 23/31] powerpc/mm: Increase the width of #define Aneesh Kumar K.V
2015-10-12 18:40 ` [PATCH v3 24/31] powerpc/mm: Convert __hash_page_64K to C Aneesh Kumar K.V
2015-10-12 18:40 ` [PATCH v3 25/31] powerpc/mm: Convert 4k insert from asm " Aneesh Kumar K.V
2015-10-12 18:40 ` [PATCH v3 26/31] powerpc/mm: Remove the dependency on pte bit position in asm code Aneesh Kumar K.V
2015-10-12 18:40 ` [PATCH v3 27/31] powerpc/mm: Add helper for converting pte bit to hpte bits Aneesh Kumar K.V
2015-10-12 18:40 ` [PATCH v3 28/31] powerpc/mm: Move WIMG update to helper Aneesh Kumar K.V
2015-10-12 18:40 ` [PATCH v3 29/31] powerpc/mm: Move hugetlb related headers Aneesh Kumar K.V
2015-10-12 18:40 ` [PATCH v3 30/31] powerpc/mm: Move THP headers around Aneesh Kumar K.V
2015-10-12 18:40 ` [PATCH v3 31/31] powerpc/mm: Add a _PAGE_PTE bit Aneesh Kumar K.V
2015-10-13 0:22 ` [PATCH v3 00/31] powerpc/mm: Update page table format for book3s 64 Scott Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1444675215-19484-5-git-send-email-aneesh.kumar@linux.vnet.ibm.com \
--to=aneesh.kumar@linux.vnet.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=scottwood@freescale.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).