From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
aneesh.kumar@linux.ibm.com
Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 04/15] powerpc/mm: move pgtable_t in asm/mmu.h
Date: Fri, 26 Apr 2019 15:58:02 +0000 (UTC) [thread overview]
Message-ID: <4f8ba02f8fbd355a140b5c33c8186e2c037a45a1.1556293738.git.christophe.leroy@c-s.fr> (raw)
In-Reply-To: <cover.1556293738.git.christophe.leroy@c-s.fr>
pgtable_t is now identical for all subarches, move it to the
top level asm/mmu.h
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
arch/powerpc/include/asm/book3s/32/mmu-hash.h | 4 ----
arch/powerpc/include/asm/book3s/64/mmu.h | 8 --------
arch/powerpc/include/asm/mmu.h | 3 +++
arch/powerpc/include/asm/nohash/32/mmu.h | 6 ------
arch/powerpc/include/asm/nohash/64/mmu.h | 6 ------
5 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/arch/powerpc/include/asm/book3s/32/mmu-hash.h b/arch/powerpc/include/asm/book3s/32/mmu-hash.h
index f9eae105a9f4..2e277ca0170f 100644
--- a/arch/powerpc/include/asm/book3s/32/mmu-hash.h
+++ b/arch/powerpc/include/asm/book3s/32/mmu-hash.h
@@ -10,8 +10,6 @@
* BATs
*/
-#include <asm/page.h>
-
/* Block size masks */
#define BL_128K 0x000
#define BL_256K 0x001
@@ -49,8 +47,6 @@ struct ppc_bat {
u32 batu;
u32 batl;
};
-
-typedef pte_t *pgtable_t;
#endif /* !__ASSEMBLY__ */
/*
diff --git a/arch/powerpc/include/asm/book3s/64/mmu.h b/arch/powerpc/include/asm/book3s/64/mmu.h
index 230a9dec7677..d4a94c2b29f2 100644
--- a/arch/powerpc/include/asm/book3s/64/mmu.h
+++ b/arch/powerpc/include/asm/book3s/64/mmu.h
@@ -25,14 +25,6 @@ struct mmu_psize_def {
};
};
extern struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT];
-
-/*
- * For BOOK3s 64 with 4k and 64K linux page size
- * we want to use pointers, because the page table
- * actually store pfn
- */
-typedef pte_t *pgtable_t;
-
#endif /* __ASSEMBLY__ */
/*
diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h
index d86c5641bd97..ba94ce8c22d7 100644
--- a/arch/powerpc/include/asm/mmu.h
+++ b/arch/powerpc/include/asm/mmu.h
@@ -129,6 +129,9 @@
#ifndef __ASSEMBLY__
#include <linux/bug.h>
#include <asm/cputable.h>
+#include <asm/page.h>
+
+typedef pte_t *pgtable_t;
#ifdef CONFIG_PPC_FSL_BOOK3E
#include <asm/percpu.h>
diff --git a/arch/powerpc/include/asm/nohash/32/mmu.h b/arch/powerpc/include/asm/nohash/32/mmu.h
index 7d94a36d57d2..af0e8b54876a 100644
--- a/arch/powerpc/include/asm/nohash/32/mmu.h
+++ b/arch/powerpc/include/asm/nohash/32/mmu.h
@@ -2,8 +2,6 @@
#ifndef _ASM_POWERPC_NOHASH_32_MMU_H_
#define _ASM_POWERPC_NOHASH_32_MMU_H_
-#include <asm/page.h>
-
#if defined(CONFIG_40x)
/* 40x-style software loaded TLB */
#include <asm/nohash/32/mmu-40x.h>
@@ -18,8 +16,4 @@
#include <asm/nohash/32/mmu-8xx.h>
#endif
-#ifndef __ASSEMBLY__
-typedef pte_t *pgtable_t;
-#endif
-
#endif /* _ASM_POWERPC_NOHASH_32_MMU_H_ */
diff --git a/arch/powerpc/include/asm/nohash/64/mmu.h b/arch/powerpc/include/asm/nohash/64/mmu.h
index 26e05ce8f5aa..e490ecdac012 100644
--- a/arch/powerpc/include/asm/nohash/64/mmu.h
+++ b/arch/powerpc/include/asm/nohash/64/mmu.h
@@ -4,13 +4,7 @@
#define MAX_PHYSMEM_BITS 44
-#include <asm/page.h>
-
/* Freescale Book-E software loaded TLB or Book-3e (ISA 2.06+) MMU */
#include <asm/nohash/mmu-book3e.h>
-#ifndef __ASSEMBLY__
-typedef pte_t *pgtable_t;
-#endif
-
#endif /* _ASM_POWERPC_NOHASH_64_MMU_H_ */
--
2.13.3
next prev parent reply other threads:[~2019-04-26 16:05 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-26 15:57 [PATCH v2 00/15] Refactor pgalloc stuff Christophe Leroy
2019-04-26 15:57 ` [PATCH v2 01/15] powerpc/mm: drop __bad_pte() Christophe Leroy
2019-05-03 6:59 ` Michael Ellerman
2019-04-26 15:58 ` [PATCH v2 02/15] powerpc/mm: define __pud_free_tlb() at all time on nohash/64 Christophe Leroy
2019-04-26 15:58 ` [PATCH v2 03/15] powerpc/mm: convert Book3E 64 to pte_fragment Christophe Leroy
2019-05-06 6:37 ` Christophe Leroy
2019-05-06 11:29 ` Michael Ellerman
2019-04-26 15:58 ` Christophe Leroy [this message]
2019-04-26 15:58 ` [PATCH v2 05/15] powerpc/mm: get rid of nohash/32/mmu.h and nohash/64/mmu.h Christophe Leroy
2019-04-26 15:58 ` [PATCH v2 06/15] powerpc/Kconfig: select PPC_MM_SLICES from subarch type Christophe Leroy
2019-04-26 15:58 ` [PATCH v2 07/15] powerpc/book3e: move early_alloc_pgtable() to init section Christophe Leroy
2019-04-26 15:58 ` [PATCH v2 08/15] powerpc/mm: don't use pte_alloc_kernel() until slab is available on PPC32 Christophe Leroy
2019-04-26 15:58 ` [PATCH v2 09/15] powerpc/mm: inline pte_alloc_one_kernel() and pte_alloc_one() " Christophe Leroy
2019-04-26 15:58 ` [PATCH v2 10/15] powerpc/mm: refactor pte_alloc_one() and pte_free() families definition Christophe Leroy
2019-04-26 15:58 ` [PATCH v2 11/15] powerpc/mm: refactor definition of pgtable_cache[] Christophe Leroy
2019-04-26 15:58 ` [PATCH v2 12/15] powerpc/mm: Only keep one version of pmd_populate() functions on nohash/32 Christophe Leroy
2019-04-26 15:58 ` [PATCH v2 13/15] powerpc/mm: refactor pgtable freeing functions on nohash Christophe Leroy
2019-04-26 15:58 ` [PATCH v2 14/15] powerpc/mm: refactor pmd_pgtable() Christophe Leroy
2019-04-26 15:58 ` [PATCH v2 15/15] powerpc/mm: refactor pgd_alloc() and pgd_free() on nohash Christophe Leroy
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=4f8ba02f8fbd355a140b5c33c8186e2c037a45a1.1556293738.git.christophe.leroy@c-s.fr \
--to=christophe.leroy@c-s.fr \
--cc=aneesh.kumar@linux.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
/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).