mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Mike Rapoport (Microsoft)" <rppt@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: 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-sh@vger.kernel.org,  linux-kernel@vger.kernel.org,
	linux-mm@kvack.org
Subject: [PATCH v3 02/10] sh: mm: remove numa.c
Date: Thu, 02 Jul 2026 12:37:51 +0300	[thread overview]
Message-ID: <20260702-sh-numa-v2-v3-2-57e2435603de@kernel.org> (raw)
In-Reply-To: <20260702-sh-numa-v2-v3-0-57e2435603de@kernel.org>

Since CONFIG_NUMA is removed, numa.c won't be ever compiled.

Remove it.

Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
---
 arch/sh/mm/Makefile |  1 -
 arch/sh/mm/numa.c   | 53 -----------------------------------------------------
 2 files changed, 54 deletions(-)

diff --git a/arch/sh/mm/Makefile b/arch/sh/mm/Makefile
index f69ddc70b146..7033947955d6 100644
--- a/arch/sh/mm/Makefile
+++ b/arch/sh/mm/Makefile
@@ -37,7 +37,6 @@ endif
 obj-$(CONFIG_DEBUG_FS)		+= $(debugfs-y)
 obj-$(CONFIG_HUGETLB_PAGE)	+= hugetlbpage.o
 obj-$(CONFIG_PMB)		+= pmb.o
-obj-$(CONFIG_NUMA)		+= numa.o
 obj-$(CONFIG_IOREMAP_FIXED)	+= ioremap_fixed.o
 obj-$(CONFIG_UNCACHED_MAPPING)	+= uncached.o
 obj-$(CONFIG_HAVE_SRAM_POOL)	+= sram.o
diff --git a/arch/sh/mm/numa.c b/arch/sh/mm/numa.c
deleted file mode 100644
index 9bc212b5e762..000000000000
--- a/arch/sh/mm/numa.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * arch/sh/mm/numa.c - Multiple node support for SH machines
- *
- *  Copyright (C) 2007  Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#include <linux/module.h>
-#include <linux/memblock.h>
-#include <linux/mm.h>
-#include <linux/numa.h>
-#include <linux/pfn.h>
-#include <asm/sections.h>
-
-/*
- * On SH machines the conventional approach is to stash system RAM
- * in node 0, and other memory blocks in to node 1 and up, ordered by
- * latency. Each node's pgdat is node-local at the beginning of the node,
- * immediately followed by the node mem map.
- */
-void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end)
-{
-	unsigned long start_pfn, end_pfn;
-
-	/* Don't allow bogus node assignment */
-	BUG_ON(nid >= MAX_NUMNODES || nid <= 0);
-
-	start_pfn = PFN_DOWN(start);
-	end_pfn = PFN_DOWN(end);
-
-	pmb_bolt_mapping((unsigned long)__va(start), start, end - start,
-			 PAGE_KERNEL);
-
-	memblock_add(start, end - start);
-
-	__add_active_range(nid, start_pfn, end_pfn);
-
-	/* Node-local pgdat */
-	NODE_DATA(nid) = memblock_alloc_node(sizeof(struct pglist_data),
-					     SMP_CACHE_BYTES, nid);
-	if (!NODE_DATA(nid))
-		panic("%s: Failed to allocate %zu bytes align=0x%x nid=%d\n",
-		      __func__, sizeof(struct pglist_data), SMP_CACHE_BYTES,
-		      nid);
-
-	NODE_DATA(nid)->node_start_pfn = start_pfn;
-	NODE_DATA(nid)->node_spanned_pages = end_pfn - start_pfn;
-
-	/* It's up */
-	node_set_online(nid);
-}

-- 
2.53.0


  parent reply	other threads:[~2026-07-02  9:38 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-02  9:37 [PATCH v3 00/10] sh: remove NUMA and SPARSEMEM support Mike Rapoport (Microsoft)
2026-07-02  9:37 ` [PATCH v3 01/10] sh: remove CONFIG_NUMA and realted configuration options Mike Rapoport (Microsoft)
2026-07-02  9:37 ` Mike Rapoport (Microsoft) [this message]
2026-07-02  9:37 ` [PATCH v3 03/10] sh: mm: drop allocate_pgdat() Mike Rapoport (Microsoft)
2026-07-02  9:37 ` [PATCH v3 04/10] sh: remove setup_bootmem_node() and plat_mem_setup() Mike Rapoport (Microsoft)
2026-07-02  9:37 ` [PATCH v3 05/10] sh: drop dead code guarded by #ifdef CONFIG_NUMA Mike Rapoport (Microsoft)
2026-07-02  9:37 ` [PATCH v3 06/10] sh: drop include/asm/mmzone.h Mike Rapoport (Microsoft)
2026-07-02  9:37 ` [PATCH v3 07/10] init/Kconfig: drop ARCH_WANT_NUMA_VARIABLE_LOCALITY Mike Rapoport (Microsoft)
2026-07-02  9:37 ` [PATCH v3 08/10] sh: init: remove call the memblock_set_node() Mike Rapoport (Microsoft)
2026-07-02  9:37 ` [PATCH v3 09/10] sh: remove SPARSEMEM related entries from Kconfig Mike Rapoport (Microsoft)
2026-07-02  9:37 ` [PATCH v3 10/10] sh: drop include/asm/sparsemem.h Mike Rapoport (Microsoft)
2026-07-02  9:54 ` [PATCH v3 00/10] sh: remove NUMA and SPARSEMEM support John Paul Adrian Glaubitz
2026-07-02 10:20   ` Mike Rapoport
2026-07-02 10:25     ` John Paul Adrian Glaubitz
2026-07-03  6:16       ` Mike Rapoport

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=20260702-sh-numa-v2-v3-2-57e2435603de@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

all inboxes | Powered by JetHome®