From: Nicholas Piggin <npiggin@gmail•com>
To: linuxppc-dev@lists•ozlabs.org
Cc: Nicholas Piggin <npiggin@gmail•com>
Subject: [PATCH v6 09/18] powerpc/64s: move page size definitions from hash specific file
Date: Thu, 2 Dec 2021 00:41:44 +1000 [thread overview]
Message-ID: <20211201144153.2456614-10-npiggin@gmail.com> (raw)
In-Reply-To: <20211201144153.2456614-1-npiggin@gmail.com>
The radix code uses some of the psize variables. Move the common
ones from hash_utils.c to pgtable.c.
Signed-off-by: Nicholas Piggin <npiggin@gmail•com>
---
arch/powerpc/mm/book3s64/hash_utils.c | 5 -----
arch/powerpc/mm/book3s64/pgtable.c | 7 +++++++
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/mm/book3s64/hash_utils.c b/arch/powerpc/mm/book3s64/hash_utils.c
index 97a36fa3940e..eced266dc5e9 100644
--- a/arch/powerpc/mm/book3s64/hash_utils.c
+++ b/arch/powerpc/mm/book3s64/hash_utils.c
@@ -99,8 +99,6 @@
*/
static unsigned long _SDR1;
-struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT];
-EXPORT_SYMBOL_GPL(mmu_psize_defs);
u8 hpte_page_sizes[1 << LP_BITS];
EXPORT_SYMBOL_GPL(hpte_page_sizes);
@@ -114,9 +112,6 @@ EXPORT_SYMBOL_GPL(mmu_linear_psize);
int mmu_virtual_psize = MMU_PAGE_4K;
int mmu_vmalloc_psize = MMU_PAGE_4K;
EXPORT_SYMBOL_GPL(mmu_vmalloc_psize);
-#ifdef CONFIG_SPARSEMEM_VMEMMAP
-int mmu_vmemmap_psize = MMU_PAGE_4K;
-#endif
int mmu_io_psize = MMU_PAGE_4K;
int mmu_kernel_ssize = MMU_SEGSIZE_256M;
EXPORT_SYMBOL_GPL(mmu_kernel_ssize);
diff --git a/arch/powerpc/mm/book3s64/pgtable.c b/arch/powerpc/mm/book3s64/pgtable.c
index 9e16c7b1a6c5..81f2e5b670e2 100644
--- a/arch/powerpc/mm/book3s64/pgtable.c
+++ b/arch/powerpc/mm/book3s64/pgtable.c
@@ -22,6 +22,13 @@
#include "internal.h"
+struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT];
+EXPORT_SYMBOL_GPL(mmu_psize_defs);
+
+#ifdef CONFIG_SPARSEMEM_VMEMMAP
+int mmu_vmemmap_psize = MMU_PAGE_4K;
+#endif
+
unsigned long __pmd_frag_nr;
EXPORT_SYMBOL(__pmd_frag_nr);
unsigned long __pmd_frag_size_shift;
--
2.23.0
next prev parent reply other threads:[~2021-12-01 14:48 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-01 14:41 [PATCH v6 00/18] powerpc: Make hash MMU code build configurable Nicholas Piggin
2021-12-01 14:41 ` [PATCH v6 01/18] powerpc: Remove unused FW_FEATURE_NATIVE references Nicholas Piggin
2021-12-01 14:41 ` [PATCH v6 02/18] powerpc: Rename PPC_NATIVE to PPC_HASH_MMU_NATIVE Nicholas Piggin
2021-12-01 14:41 ` [PATCH v6 03/18] powerpc/pseries: Stop selecting PPC_HASH_MMU_NATIVE Nicholas Piggin
2021-12-01 14:41 ` [PATCH v6 04/18] powerpc/64s: Move and rename do_bad_slb_fault as it is not hash specific Nicholas Piggin
2021-12-01 14:41 ` [PATCH v6 05/18] powerpc/pseries: move process table registration away from hash-specific code Nicholas Piggin
2021-12-01 14:41 ` [PATCH v6 06/18] powerpc/pseries: lparcfg don't include slb_size line in radix mode Nicholas Piggin
2021-12-01 14:41 ` [PATCH v6 07/18] powerpc/64s: move THP trace point creation out of hash specific file Nicholas Piggin
2021-12-01 14:41 ` [PATCH v6 08/18] powerpc/64s: Make flush_and_reload_slb a no-op when radix is enabled Nicholas Piggin
2021-12-01 14:41 ` Nicholas Piggin [this message]
2021-12-01 14:41 ` [PATCH v6 10/18] powerpc/64s: Rename hash_hugetlbpage.c to hugetlbpage.c Nicholas Piggin
2021-12-01 14:41 ` [PATCH v6 11/18] powerpc/64: pcpu setup avoid reading mmu_linear_psize on 64e or radix Nicholas Piggin
2021-12-01 14:41 ` [PATCH v6 12/18] powerpc: make memremap_compat_align 64s-only Nicholas Piggin
2021-12-01 14:41 ` [PATCH v6 13/18] powerpc/64e: remove mmu_linear_psize Nicholas Piggin
2021-12-01 14:41 ` [PATCH v6 14/18] powerpc/64s: Fix radix MMU when MMU_FTR_HPTE_TABLE is clear Nicholas Piggin
2021-12-01 14:41 ` [PATCH v6 15/18] powerpc/64s: Always define arch unmapped area calls Nicholas Piggin
2021-12-08 9:38 ` Christophe Leroy
2021-12-09 8:25 ` Nicholas Piggin
2021-12-09 8:28 ` Christophe Leroy
2021-12-09 9:30 ` Nicholas Piggin
2021-12-08 10:00 ` Christophe Leroy
2021-12-09 8:29 ` Nicholas Piggin
2021-12-01 14:41 ` [PATCH v6 16/18] powerpc/64s: Make hash MMU support configurable Nicholas Piggin
2021-12-01 14:41 ` [PATCH v6 17/18] powerpc/64s: Move hash MMU support code under CONFIG_PPC_64S_HASH_MMU Nicholas Piggin
2021-12-02 13:30 ` Fabiano Rosas
2021-12-03 12:34 ` Michael Ellerman
2021-12-07 12:58 ` Michael Ellerman
2021-12-07 13:00 ` Michael Ellerman
2021-12-09 8:30 ` Nicholas Piggin
2021-12-01 14:41 ` [PATCH v6 18/18] powerpc/microwatt: add POWER9_CPU, clear PPC_64S_HASH_MMU Nicholas Piggin
2021-12-15 0:24 ` [PATCH v6 00/18] powerpc: Make hash MMU code build configurable Michael Ellerman
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=20211201144153.2456614-10-npiggin@gmail.com \
--to=npiggin@gmail$(echo .)com \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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