From: Logan Gunthorpe <logang@deltatee.com>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/5] ARM: mm: make use of new memblocks_present() helper
Date: Fri, 05 Oct 2018 16:16:39 +0000	[thread overview]
Message-ID: <20181005161642.2462-3-logang@deltatee.com> (raw)
In-Reply-To: <20181005161642.2462-1-logang@deltatee.com>
Cleanup the arm_memory_present() function seeing it's very
similar to other arches.
The new memblocks_present() helper checks for node ids which the
arm version did not. However, this is equivalent seeing
HAVE_MEMBLOCK_NODE_MAP should be false in this arch and therefore
memblock_get_region_node() should return 0.
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Kees Cook <keescook@chromium.org>
Cc: Philip Derrin <philip@cog.systems>
Cc: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Cc: Nicolas Pitre <nicolas.pitre@linaro.org>
---
 arch/arm/mm/init.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 0cc8e04295a4..e2710dd7446f 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -201,21 +201,6 @@ int pfn_valid(unsigned long pfn)
 EXPORT_SYMBOL(pfn_valid);
 #endif
 
-#ifndef CONFIG_SPARSEMEM
-static void __init arm_memory_present(void)
-{
-}
-#else
-static void __init arm_memory_present(void)
-{
-	struct memblock_region *reg;
-
-	for_each_memblock(memory, reg)
-		memory_present(0, memblock_region_memory_base_pfn(reg),
-			       memblock_region_memory_end_pfn(reg));
-}
-#endif
-
 static bool arm_memblock_steal_permitted = true;
 
 phys_addr_t __init arm_memblock_steal(phys_addr_t size, phys_addr_t align)
@@ -317,7 +302,7 @@ void __init bootmem_init(void)
 	 * Sparsemem tries to allocate bootmem in memory_present(),
 	 * so must be done after the fixed reservations
 	 */
-	arm_memory_present();
+	memblocks_present();
 
 	/*
 	 * sparse_init() needs the bootmem allocator up and running.
-- 
2.19.0
next prev parent reply	other threads:[~2018-10-05 16:16 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-05 16:16 [PATCH 0/5] sparsemem support for RISC-V Logan Gunthorpe
2018-10-05 16:16 ` [PATCH 1/5] mm/sparse: add common helper to mark all memblocks present Logan Gunthorpe
2018-10-11 13:30   ` Christoph Hellwig
2018-10-05 16:16 ` Logan Gunthorpe [this message]
2018-10-05 16:16 ` [PATCH 3/5] arm64: mm: make use of new memblocks_present() helper Logan Gunthorpe
2018-10-05 16:32   ` Catalin Marinas
2018-10-05 16:16 ` [PATCH 4/5] sh: " Logan Gunthorpe
2018-10-05 16:16 ` [PATCH 5/5] RISC-V: Implement sparsemem Logan Gunthorpe
2018-10-11  0:27   ` Palmer Dabbelt
2018-10-11 12:18     ` Stephen  Bates
2018-10-15 17:39       ` Palmer Dabbelt
2018-10-11 13:37   ` Christoph Hellwig
2018-10-11 16:24     ` Logan Gunthorpe
2018-10-11 17:30       ` Logan Gunthorpe
2018-10-11 18:45       ` Logan Gunthorpe
2018-10-11 20:21         ` Logan Gunthorpe
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=20181005161642.2462-3-logang@deltatee.com \
    --to=logang@deltatee.com \
    --cc=linux-arm-kernel@lists.infradead.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).