From: Mike Rapoport <rppt@kernel.org>
To: linux-sh@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
Arnd Bergmann <arnd@arndb.de>,
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>,
Mike Rapoport <rppt@kernel.org>, Rich Felker <dalias@libc.org>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
linux-kernel@vger.kernel.org, linux-mm@kvack.org
Subject: [PATCH 06/10] sh: drop include/asm/mmzone.h
Date: Mon, 13 Apr 2026 13:46:44 +0300 [thread overview]
Message-ID: <20260413104649.852228-7-rppt@kernel.org> (raw)
In-Reply-To: <20260413104649.852228-1-rppt@kernel.org>
From: "Mike Rapoport (Microsoft)" <rppt@kernel.org>
include/asm/mmzone.h was required for declarations of NUMA related
functionality.
The only function declared there that's not related to NUMA is
__add_active_range().
Move __add_active_range() declaration to include/asm/setup.h and drop
include/asm/mmzone.h
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
---
arch/sh/include/asm/mmzone.h | 42 --------------------------
arch/sh/include/asm/setup.h | 3 ++
arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 1 -
arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 1 -
arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 1 -
arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 1 -
arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 1 -
arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 1 -
arch/sh/kernel/cpu/sh4a/setup-shx3.c | 1 -
arch/sh/kernel/setup.c | 2 --
arch/sh/mm/init.c | 1 -
11 files changed, 3 insertions(+), 52 deletions(-)
delete mode 100644 arch/sh/include/asm/mmzone.h
diff --git a/arch/sh/include/asm/mmzone.h b/arch/sh/include/asm/mmzone.h
deleted file mode 100644
index 63f88b465e39..000000000000
--- a/arch/sh/include/asm/mmzone.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __ASM_SH_MMZONE_H
-#define __ASM_SH_MMZONE_H
-
-#ifdef CONFIG_NUMA
-#include <linux/numa.h>
-
-static inline int pfn_to_nid(unsigned long pfn)
-{
- int nid;
-
- for (nid = 0; nid < MAX_NUMNODES; nid++)
- if (pfn >= node_start_pfn(nid) && pfn <= node_end_pfn(nid))
- break;
-
- return nid;
-}
-
-static inline struct pglist_data *pfn_to_pgdat(unsigned long pfn)
-{
- return NODE_DATA(pfn_to_nid(pfn));
-}
-
-/* arch/sh/mm/numa.c */
-void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end);
-#else
-static inline void
-setup_bootmem_node(int nid, unsigned long start, unsigned long end)
-{
-}
-#endif /* CONFIG_NUMA */
-
-/* Platform specific mem init */
-void __init plat_mem_setup(void);
-
-/* arch/sh/kernel/setup.c */
-void __init __add_active_range(unsigned int nid, unsigned long start_pfn,
- unsigned long end_pfn);
-/* arch/sh/mm/init.c */
-void __init allocate_pgdat(unsigned int nid);
-
-#endif /* __ASM_SH_MMZONE_H */
diff --git a/arch/sh/include/asm/setup.h b/arch/sh/include/asm/setup.h
index 84bb23a771f3..6bd5b0d87abe 100644
--- a/arch/sh/include/asm/setup.h
+++ b/arch/sh/include/asm/setup.h
@@ -23,4 +23,7 @@ void check_for_initrd(void);
void per_cpu_trap_init(void);
void sh_fdt_init(phys_addr_t dt_phys);
+void __add_active_range(unsigned int nid, unsigned long start_pfn,
+ unsigned long end_pfn);
+
#endif /* _SH_SETUP_H */
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
index 2180819a1455..5e2c24c518b4 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
@@ -16,7 +16,6 @@
#include <linux/usb/m66592.h>
#include <asm/clock.h>
-#include <asm/mmzone.h>
#include <asm/siu.h>
#include <asm/platform_early.h>
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
index d64d28c4f059..5c24ff407c89 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
@@ -17,7 +17,6 @@
#include <asm/cacheflush.h>
#include <asm/clock.h>
-#include <asm/mmzone.h>
#include <asm/platform_early.h>
#include <cpu/sh7723.h>
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
index ef4b26a4b3d6..9441e4a0f402 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
@@ -24,7 +24,6 @@
#include <asm/cacheflush.h>
#include <asm/suspend.h>
#include <asm/clock.h>
-#include <asm/mmzone.h>
#include <asm/platform_early.h>
#include <cpu/dma-register.h>
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
index 1f4396da00e5..3750b598d6bd 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
@@ -21,7 +21,6 @@
#include <cpu/dma-register.h>
#include <cpu/sh7757.h>
-#include <asm/mmzone.h>
#include <asm/platform_early.h>
static struct plat_sci_port scif2_platform_data = {
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
index 95c3cc15a443..13f08c44fb02 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
@@ -13,7 +13,6 @@
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
#include <linux/sh_intc.h>
-#include <asm/mmzone.h>
#include <asm/platform_early.h>
#include <cpu/dma-register.h>
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c
index a46d6c3241a9..79484c598b83 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c
@@ -22,7 +22,6 @@
#include <linux/sh_intc.h>
#include <linux/usb/ohci_pdriver.h>
#include <cpu/dma-register.h>
-#include <asm/mmzone.h>
#include <asm/platform_early.h>
static struct plat_sci_port scif0_platform_data = {
diff --git a/arch/sh/kernel/cpu/sh4a/setup-shx3.c b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
index 3197ec2a65cd..93cdd1ee888d 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
@@ -13,7 +13,6 @@
#include <linux/sh_timer.h>
#include <linux/sh_intc.h>
#include <cpu/shx3.h>
-#include <asm/mmzone.h>
#include <asm/platform_early.h>
/*
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 5e25c1db4d61..2f2764061003 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -23,7 +23,6 @@
#include <linux/smp.h>
#include <linux/err.h>
#include <linux/crash_dump.h>
-#include <linux/mmzone.h>
#include <linux/clk.h>
#include <linux/delay.h>
#include <linux/platform_device.h>
@@ -41,7 +40,6 @@
#include <asm/clock.h>
#include <asm/smp.h>
#include <asm/mmu_context.h>
-#include <asm/mmzone.h>
#include <asm/processor.h>
#include <asm/sparsemem.h>
#include <asm/platform_early.h>
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index b34ba42d1e18..31a9676efbe3 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -20,7 +20,6 @@
#include <linux/dma-mapping.h>
#include <linux/export.h>
#include <asm/mmu_context.h>
-#include <asm/mmzone.h>
#include <asm/kexec.h>
#include <asm/tlb.h>
#include <asm/cacheflush.h>
--
2.53.0
next prev parent reply other threads:[~2026-04-13 10:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-13 10:46 [PATCH 00/10] sh: remove NUMA and SPARSEMEM support Mike Rapoport
2026-04-13 10:46 ` [PATCH 01/10] sh: remove CONFIG_NUMA and realted configuration options Mike Rapoport
2026-04-13 10:46 ` [PATCH 02/10] sh: mm: remove numa.c Mike Rapoport
2026-04-13 10:46 ` [PATCH 03/10] sh: mm: drop allocate_pgdat() Mike Rapoport
2026-04-13 10:46 ` [PATCH 04/10] sh: remove setup_bootmem_node() and plat_mem_setup() Mike Rapoport
2026-04-13 10:46 ` [PATCH 05/10] sh: drop dead code guarded by #ifdef CONFIG_NUMA Mike Rapoport
2026-04-13 10:46 ` Mike Rapoport [this message]
2026-04-13 10:46 ` [PATCH 07/10] init/Kconfig: drop ARCH_WANT_NUMA_VARIABLE_LOCALITY Mike Rapoport
2026-04-13 10:46 ` [PATCH 08/10] sh: init: remove call the memblock_set_node() Mike Rapoport
2026-04-13 10:46 ` [PATCH 09/10] sh: remove SPARSEMEM related entries from Kconfig Mike Rapoport
2026-04-13 10:46 ` [PATCH 10/10] sh: drop include/asm/sparsemem.h Mike Rapoport
2026-04-13 10:57 ` [PATCH 00/10] sh: remove NUMA and SPARSEMEM support John Paul Adrian Glaubitz
2026-04-13 11:10 ` Mike Rapoport
2026-04-13 11:14 ` Arnd Bergmann
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=20260413104649.852228-7-rppt@kernel.org \
--to=rppt@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=dalias@libc.org \
--cc=glaubitz@physik.fu-berlin.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-sh@vger.kernel.org \
--cc=ysato@users.sourceforge.jp \
/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