From: Andrew Morton <akpm@linux-foundation.org>
To: mm-commits@vger.kernel.org,ysato@users.sourceforge.jp,glaubitz@physik.fu-berlin.de,dalias@libc.org,arnd@arndb.de,rppt@kernel.org,akpm@linux-foundation.org
Subject: [merged mm-stable] sh-drop-include-asm-mmzoneh.patch removed from -mm tree
Date: Sat, 24 Oct 2026 01:58:49 -0700 [thread overview]
Message-ID: <20261024085849.E4DD51F01828@smtp.kernel.org> (raw)
The quilt patch titled
Subject: sh: drop include/asm/mmzone.h
has been removed from the -mm tree. Its filename was
sh-drop-include-asm-mmzoneh.patch
This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Mike Rapoport (Microsoft)" <rppt@kernel.org>
Subject: sh: drop include/asm/mmzone.h
Date: Sun, 10 May 2026 16:55:42 +0300
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
Link: https://lore.kernel.org/20260510135546.13554-7-rppt@kernel.org
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Rich Felker <dalias@libc.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
---
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(-)
diff --git a/arch/sh/include/asm/mmzone.h a/arch/sh/include/asm/mmzone.h
deleted file mode 100644
--- 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 */
--- a/arch/sh/include/asm/setup.h~sh-drop-include-asm-mmzoneh
+++ a/arch/sh/include/asm/setup.h
@@ -24,4 +24,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 */
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c~sh-drop-include-asm-mmzoneh
+++ a/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>
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c~sh-drop-include-asm-mmzoneh
+++ a/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>
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c~sh-drop-include-asm-mmzoneh
+++ a/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>
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c~sh-drop-include-asm-mmzoneh
+++ a/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 = {
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c~sh-drop-include-asm-mmzoneh
+++ a/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>
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c~sh-drop-include-asm-mmzoneh
+++ a/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 = {
--- a/arch/sh/kernel/cpu/sh4a/setup-shx3.c~sh-drop-include-asm-mmzoneh
+++ a/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>
/*
--- a/arch/sh/kernel/setup.c~sh-drop-include-asm-mmzoneh
+++ a/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>
--- a/arch/sh/mm/init.c~sh-drop-include-asm-mmzoneh
+++ a/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>
_
Patches currently in -mm which might be from rppt@kernel.org are
reply other threads:[~2026-10-24 8:58 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20261024085849.E4DD51F01828@smtp.kernel.org \
--to=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=dalias@libc.org \
--cc=glaubitz@physik.fu-berlin.de \
--cc=mm-commits@vger.kernel.org \
--cc=rppt@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.