In the current code, the data used by memblock are initialized
statically. But in some special cases we may scan the memory twice.
So we should have a way to reinitialize these data before the second
time.
Signed-off-by: Kevin Hao <haoke...@gmail.com>
---
A new patch in v2.
include/linux/memblock.h | 1 +
mm/memblock.c | 33 +++++++++++++++++++++++----------
2 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index f388203..9d55311 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -58,6 +58,7 @@ int memblock_remove(phys_addr_t base, phys_addr_t size);
int memblock_free(phys_addr_t base, phys_addr_t size);
int memblock_reserve(phys_addr_t base, phys_addr_t size);
void memblock_trim_memory(phys_addr_t align);
+void memblock_reinit(void);
#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
void __next_mem_pfn_range(int *idx, int nid, unsigned long *out_start_pfn,
diff --git a/mm/memblock.c b/mm/memblock.c
index c5fad93..9406ce6 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -23,23 +23,36 @@
static struct memblock_region
memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
static struct memblock_region
memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
-struct memblock memblock __initdata_memblock = {
- .memory.regions = memblock_memory_init_regions,
- .memory.cnt = 1, /* empty dummy entry */
- .memory.max = INIT_MEMBLOCK_REGIONS,
-
- .reserved.regions = memblock_reserved_init_regions,
- .reserved.cnt = 1, /* empty dummy entry */
- .reserved.max = INIT_MEMBLOCK_REGIONS,
+#define INIT_MEMBLOCK {
\
+ .memory.regions = memblock_memory_init_regions, \
+ .memory.cnt = 1, /* empty dummy entry */ \
+ .memory.max = INIT_MEMBLOCK_REGIONS, \
+ \
+ .reserved.regions = memblock_reserved_init_regions, \
+ .reserved.cnt = 1, /* empty dummy entry */ \
+ .reserved.max = INIT_MEMBLOCK_REGIONS, \
+ \
+ .current_limit = MEMBLOCK_ALLOC_ANYWHERE, \
+}
- .current_limit = MEMBLOCK_ALLOC_ANYWHERE,
-};
+struct memblock memblock __initdata_memblock = INIT_MEMBLOCK;
int memblock_debug __initdata_memblock;
static int memblock_can_resize __initdata_memblock;
static int memblock_memory_in_slab __initdata_memblock = 0;
static int memblock_reserved_in_slab __initdata_memblock = 0;
+void __init memblock_reinit(void)
+{
+ memset(memblock_memory_init_regions, 0,
+ sizeof(memblock_memory_init_regions));
+ memset(memblock_reserved_init_regions, 0,
+ sizeof(memblock_reserved_init_regions));
+
+ memset(&memblock, 0, sizeof(memblock));
+ memblock = (struct memblock) INIT_MEMBLOCK;
+}
+
/* inline so we don't get a warning when pr_debug is compiled out */
static __init_memblock const char *
memblock_type_name(struct memblock_type *type)
--
1.8.1.4
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
