Commit 997aef68 authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds

init: provide a generic free_initmem implementation

Patch series "provide a generic free_initmem implementation", v2.

Many architectures implement free_initmem() in exactly the same or very
similar way: they wrap the call to free_initmem_default() with sometimes
different 'poison' parameter.

These patches switch those architectures to use a generic implementation
that does free_initmem_default(POISON_FREE_INITMEM).

This was inspired by Christoph's patches for free_initrd_mem [1] and I
shamelessly copied changelog entries from his patches :)

[1] https://lore.kernel.org/lkml/20190213174621.29297-1-hch@lst.de/

This patch (of 2):

For most architectures free_initmem just a wrapper for the same
free_initmem_default(-1) call.  Provide that as a generic implementation
marked __weak.

Link: http://lkml.kernel.org/r/1550515285-17446-2-git-send-email-rppt@linux.ibm.comSigned-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Palmer Dabbelt <palmer@sifive.com>
Cc: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f94f7434
...@@ -285,9 +285,3 @@ mem_init(void) ...@@ -285,9 +285,3 @@ mem_init(void)
memblock_free_all(); memblock_free_all();
mem_init_print_info(NULL); mem_init_print_info(NULL);
} }
void
free_initmem(void)
{
free_initmem_default(-1);
}
...@@ -206,11 +206,3 @@ void __init mem_init(void) ...@@ -206,11 +206,3 @@ void __init mem_init(void)
memblock_free_all(); memblock_free_all();
mem_init_print_info(NULL); mem_init_print_info(NULL);
} }
/*
* free_initmem: Free all the __init memory.
*/
void __ref free_initmem(void)
{
free_initmem_default(-1);
}
...@@ -68,8 +68,3 @@ void __init mem_init(void) ...@@ -68,8 +68,3 @@ void __init mem_init(void)
mem_init_print_info(NULL); mem_init_print_info(NULL);
} }
void __init free_initmem(void)
{
free_initmem_default(-1);
}
...@@ -102,9 +102,3 @@ void __init mem_init(void) ...@@ -102,9 +102,3 @@ void __init mem_init(void)
mem_init_print_info(NULL); mem_init_print_info(NULL);
} }
void
free_initmem(void)
{
free_initmem_default(-1);
}
...@@ -186,11 +186,6 @@ void __init setup_memory(void) ...@@ -186,11 +186,6 @@ void __init setup_memory(void)
paging_init(); paging_init();
} }
void free_initmem(void)
{
free_initmem_default(-1);
}
void __init mem_init(void) void __init mem_init(void)
{ {
high_memory = (void *)__va(memory_start + lowmem_size - 1); high_memory = (void *)__va(memory_start + lowmem_size - 1);
......
...@@ -252,11 +252,6 @@ void __init mem_init(void) ...@@ -252,11 +252,6 @@ void __init mem_init(void)
return; return;
} }
void free_initmem(void)
{
free_initmem_default(-1);
}
void __set_fixmap(enum fixed_addresses idx, void __set_fixmap(enum fixed_addresses idx,
phys_addr_t phys, pgprot_t flags) phys_addr_t phys, pgprot_t flags)
{ {
......
...@@ -82,11 +82,6 @@ void __init mmu_init(void) ...@@ -82,11 +82,6 @@ void __init mmu_init(void)
flush_tlb_all(); flush_tlb_all();
} }
void __ref free_initmem(void)
{
free_initmem_default(-1);
}
#define __page_aligned(order) __aligned(PAGE_SIZE << (order)) #define __page_aligned(order) __aligned(PAGE_SIZE << (order))
pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned(PGD_ORDER); pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned(PGD_ORDER);
pte_t invalid_pte_table[PTRS_PER_PTE] __page_aligned(PTE_ORDER); pte_t invalid_pte_table[PTRS_PER_PTE] __page_aligned(PTE_ORDER);
......
...@@ -223,8 +223,3 @@ void __init mem_init(void) ...@@ -223,8 +223,3 @@ void __init mem_init(void)
mem_init_done = 1; mem_init_done = 1;
return; return;
} }
void free_initmem(void)
{
free_initmem_default(-1);
}
...@@ -403,11 +403,6 @@ void __init mem_init(void) ...@@ -403,11 +403,6 @@ void __init mem_init(void)
mem_init_done = 1; mem_init_done = 1;
} }
void free_initmem(void)
{
free_initmem_default(-1);
}
#ifdef CONFIG_MEMORY_HOTPLUG #ifdef CONFIG_MEMORY_HOTPLUG
int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap, int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap,
bool want_memblock) bool want_memblock)
......
...@@ -287,8 +287,3 @@ void __init mem_init(void) ...@@ -287,8 +287,3 @@ void __init mem_init(void)
sysctl_overcommit_memory = OVERCOMMIT_ALWAYS; sysctl_overcommit_memory = OVERCOMMIT_ALWAYS;
} }
} }
void free_initmem(void)
{
free_initmem_default(-1);
}
...@@ -216,11 +216,6 @@ void free_initrd_mem(unsigned long start, unsigned long end) ...@@ -216,11 +216,6 @@ void free_initrd_mem(unsigned long start, unsigned long end)
} }
#endif #endif
void free_initmem(void)
{
free_initmem_default(-1);
}
static void __init parse_memmap_one(char *p) static void __init parse_memmap_one(char *p)
{ {
char *oldp; char *oldp;
......
...@@ -1074,6 +1074,11 @@ static inline void mark_readonly(void) ...@@ -1074,6 +1074,11 @@ static inline void mark_readonly(void)
} }
#endif #endif
void __weak free_initmem(void)
{
free_initmem_default(-1);
}
static int __ref kernel_init(void *unused) static int __ref kernel_init(void *unused)
{ {
int ret; int ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment