From: logang@deltatee.com (Logan Gunthorpe) To: linux-riscv@lists.infradead.org Subject: [PATCH v2 3/6] ARM: mm: make use of new memblocks_present() helper Date: Mon, 15 Oct 2018 11:56:59 -0600 [thread overview] Message-ID: <20181015175702.9036-4-logang@deltatee.com> (raw) In-Reply-To: <20181015175702.9036-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
WARNING: multiple messages have this Message-ID (diff)
From: Logan Gunthorpe <logang@deltatee.com> To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org Cc: Nicolas Pitre <nicolas.pitre@linaro.org>, Albert Ou <aou@eecs.berkeley.edu>, Kees Cook <keescook@chromium.org>, Arnd Bergmann <arnd@arndb.de>, Palmer Dabbelt <palmer@sifive.com>, Russell King <linux@armlinux.org.uk>, "Steven Rostedt \(VMware\)" <rostedt@goodmis.org>, Stephen Bates <sbates@raithlin.com>, Philip Derrin <philip@cog.systems>, Andrew Morton <akpm@linux-foundation.org>, Logan Gunthorpe <logang@deltatee.com>, Christoph Hellwig <hch@lst.de> Subject: [PATCH v2 3/6] ARM: mm: make use of new memblocks_present() helper Date: Mon, 15 Oct 2018 11:56:59 -0600 [thread overview] Message-ID: <20181015175702.9036-4-logang@deltatee.com> (raw) Message-ID: <20181015175659.ncSqzhhXFbGB6yEgQ6wM3sJMfR1HJIehxIpN_pW0Pw4@z> (raw) In-Reply-To: <20181015175702.9036-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 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2018-10-15 17:56 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-10-15 17:56 [PATCH v2 0/6] sparsemem support for RISC-V Logan Gunthorpe 2018-10-15 17:56 ` Logan Gunthorpe 2018-10-15 17:56 ` [PATCH v2 1/6] mm: Introduce common STRUCT_PAGE_MAX_SHIFT define Logan Gunthorpe 2018-10-15 17:56 ` Logan Gunthorpe 2018-10-29 17:53 ` Will Deacon 2018-10-29 17:53 ` Will Deacon 2018-10-15 17:56 ` [PATCH v2 2/6] mm/sparse: add common helper to mark all memblocks present Logan Gunthorpe 2018-10-15 17:56 ` Logan Gunthorpe 2018-10-15 17:56 ` Logan Gunthorpe [this message] 2018-10-15 17:56 ` [PATCH v2 3/6] ARM: mm: make use of new memblocks_present() helper Logan Gunthorpe 2018-10-15 17:57 ` [PATCH v2 4/6] arm64: " Logan Gunthorpe 2018-10-15 17:57 ` Logan Gunthorpe 2018-10-15 17:57 ` [PATCH v2 5/6] sh: " Logan Gunthorpe 2018-10-15 17:57 ` Logan Gunthorpe 2018-10-15 17:57 ` [PATCH v2 6/6] RISC-V: Implement sparsemem Logan Gunthorpe 2018-10-15 17:57 ` Logan Gunthorpe 2018-12-17 14:59 ` Nick Kossifidis 2018-12-17 16:50 ` Logan Gunthorpe 2018-10-16 0:04 ` [PATCH v2 0/6] sparsemem support for RISC-V Palmer Dabbelt 2018-10-16 0:04 ` Palmer Dabbelt
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=20181015175702.9036-4-logang@deltatee.com \ --to=logang@deltatee.com \ --cc=linux-riscv@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: linkBe 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).