[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20190211131602.3294-1-peng.fan@nxp.com>
Date: Mon, 11 Feb 2019 13:04:59 +0000
From: Peng Fan <peng.fan@....com>
To: "linux@...linux.org.uk" <linux@...linux.org.uk>,
"arnd@...db.de" <arnd@...db.de>,
"rppt@...ux.vnet.ibm.com" <rppt@...ux.vnet.ibm.com>,
"robh@...nel.org" <robh@...nel.org>,
"f.fainelli@...il.com" <f.fainelli@...il.com>,
"akpm@...ux-foundation.org" <akpm@...ux-foundation.org>,
"mhocko@...e.com" <mhocko@...e.com>,
"rostedt@...dmis.org" <rostedt@...dmis.org>,
"nicolas.pitre@...aro.org" <nicolas.pitre@...aro.org>
CC: "linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"van.freenix@...il.com" <van.freenix@...il.com>,
Peng Fan <peng.fan@....com>
Subject: [PATCH] arm: use memblocks_present
arm_memory_present is doing same thing as memblocks_present, so
let's use common code memblocks_present instead of platform
specific arm_memory_present.
Signed-off-by: Peng Fan <peng.fan@....com>
---
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 478ea8b7db87..6c50dd407ba8 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -182,21 +182,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)
@@ -292,7 +277,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.16.4
Powered by blists - more mailing lists