The patch titled
Subject: initramfs: provide a generic free_initrd_mem implementation
has been added to the -mm tree. Its filename is
initramfs-proide-a-generic-free_initrd_mem-implementation.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/initramfs-proide-a-generic-free_initrd_mem-implementation.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/initramfs-proide-a-generic-free_initrd_mem-implementation.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Christoph Hellwig <hch@xxxxxx>
Subject: initramfs: provide a generic free_initrd_mem implementation
For most architectures free_initrd_mem just expands to the same
free_reserved_area call. Provide that as a generic implementation marked
__weak.
Link: http://lkml.kernel.org/r/20190213174621.29297-8-hch@xxxxxx
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Acked-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> [m68k]
Acked-by: Mike Rapoport <rppt@xxxxxxxxxxxxx>
Cc: Catalin Marinas <catalin.marinas@xxxxxxx> [arm64]
Cc: Steven Price <steven.price@xxxxxxx>
Cc: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Guan Xuetao <gxt@xxxxxxxxxx>
Cc: Russell King <linux@xxxxxxxxxxxxxxx>
Cc: Will Deacon <will.deacon@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/alpha/mm/init.c | 8 --------
arch/arc/mm/init.c | 7 -------
arch/c6x/mm/init.c | 7 -------
arch/h8300/mm/init.c | 8 --------
arch/m68k/mm/init.c | 7 -------
arch/microblaze/mm/init.c | 7 -------
arch/nds32/mm/init.c | 7 -------
arch/nios2/mm/init.c | 7 -------
arch/openrisc/mm/init.c | 7 -------
arch/parisc/mm/init.c | 7 -------
arch/powerpc/mm/mem.c | 7 -------
arch/sh/mm/init.c | 7 -------
arch/um/kernel/mem.c | 7 -------
arch/unicore32/mm/init.c | 7 -------
init/initramfs.c | 5 +++++
15 files changed, 5 insertions(+), 100 deletions(-)
--- a/arch/alpha/mm/init.c~initramfs-proide-a-generic-free_initrd_mem-implementation
+++ a/arch/alpha/mm/init.c
@@ -291,11 +291,3 @@ free_initmem(void)
{
free_initmem_default(-1);
}
-
-#ifdef CONFIG_BLK_DEV_INITRD
-void
-free_initrd_mem(unsigned long start, unsigned long end)
-{
- free_reserved_area((void *)start, (void *)end, -1, "initrd");
-}
-#endif
--- a/arch/arc/mm/init.c~initramfs-proide-a-generic-free_initrd_mem-implementation
+++ a/arch/arc/mm/init.c
@@ -214,10 +214,3 @@ void __ref free_initmem(void)
{
free_initmem_default(-1);
}
-
-#ifdef CONFIG_BLK_DEV_INITRD
-void __init free_initrd_mem(unsigned long start, unsigned long end)
-{
- free_reserved_area((void *)start, (void *)end, -1, "initrd");
-}
-#endif
--- a/arch/c6x/mm/init.c~initramfs-proide-a-generic-free_initrd_mem-implementation
+++ a/arch/c6x/mm/init.c
@@ -69,13 +69,6 @@ void __init mem_init(void)
mem_init_print_info(NULL);
}
-#ifdef CONFIG_BLK_DEV_INITRD
-void __init free_initrd_mem(unsigned long start, unsigned long end)
-{
- free_reserved_area((void *)start, (void *)end, -1, "initrd");
-}
-#endif
-
void __init free_initmem(void)
{
free_initmem_default(-1);
--- a/arch/h8300/mm/init.c~initramfs-proide-a-generic-free_initrd_mem-implementation
+++ a/arch/h8300/mm/init.c
@@ -103,14 +103,6 @@ void __init mem_init(void)
mem_init_print_info(NULL);
}
-
-#ifdef CONFIG_BLK_DEV_INITRD
-void free_initrd_mem(unsigned long start, unsigned long end)
-{
- free_reserved_area((void *)start, (void *)end, -1, "initrd");
-}
-#endif
-
void
free_initmem(void)
{
--- a/arch/m68k/mm/init.c~initramfs-proide-a-generic-free_initrd_mem-implementation
+++ a/arch/m68k/mm/init.c
@@ -147,10 +147,3 @@ void __init mem_init(void)
init_pointer_tables();
mem_init_print_info(NULL);
}
-
-#ifdef CONFIG_BLK_DEV_INITRD
-void free_initrd_mem(unsigned long start, unsigned long end)
-{
- free_reserved_area((void *)start, (void *)end, -1, "initrd");
-}
-#endif
--- a/arch/microblaze/mm/init.c~initramfs-proide-a-generic-free_initrd_mem-implementation
+++ a/arch/microblaze/mm/init.c
@@ -186,13 +186,6 @@ void __init setup_memory(void)
paging_init();
}
-#ifdef CONFIG_BLK_DEV_INITRD
-void free_initrd_mem(unsigned long start, unsigned long end)
-{
- free_reserved_area((void *)start, (void *)end, -1, "initrd");
-}
-#endif
-
void free_initmem(void)
{
free_initmem_default(-1);
--- a/arch/nds32/mm/init.c~initramfs-proide-a-generic-free_initrd_mem-implementation
+++ a/arch/nds32/mm/init.c
@@ -257,13 +257,6 @@ void free_initmem(void)
free_initmem_default(-1);
}
-#ifdef CONFIG_BLK_DEV_INITRD
-void free_initrd_mem(unsigned long start, unsigned long end)
-{
- free_reserved_area((void *)start, (void *)end, -1, "initrd");
-}
-#endif
-
void __set_fixmap(enum fixed_addresses idx,
phys_addr_t phys, pgprot_t flags)
{
--- a/arch/nios2/mm/init.c~initramfs-proide-a-generic-free_initrd_mem-implementation
+++ a/arch/nios2/mm/init.c
@@ -82,13 +82,6 @@ void __init mmu_init(void)
flush_tlb_all();
}
-#ifdef CONFIG_BLK_DEV_INITRD
-void __init free_initrd_mem(unsigned long start, unsigned long end)
-{
- free_reserved_area((void *)start, (void *)end, -1, "initrd");
-}
-#endif
-
void __ref free_initmem(void)
{
free_initmem_default(-1);
--- a/arch/openrisc/mm/init.c~initramfs-proide-a-generic-free_initrd_mem-implementation
+++ a/arch/openrisc/mm/init.c
@@ -224,13 +224,6 @@ void __init mem_init(void)
return;
}
-#ifdef CONFIG_BLK_DEV_INITRD
-void free_initrd_mem(unsigned long start, unsigned long end)
-{
- free_reserved_area((void *)start, (void *)end, -1, "initrd");
-}
-#endif
-
void free_initmem(void)
{
free_initmem_default(-1);
--- a/arch/parisc/mm/init.c~initramfs-proide-a-generic-free_initrd_mem-implementation
+++ a/arch/parisc/mm/init.c
@@ -921,10 +921,3 @@ void flush_tlb_all(void)
spin_unlock(&sid_lock);
}
#endif
-
-#ifdef CONFIG_BLK_DEV_INITRD
-void free_initrd_mem(unsigned long start, unsigned long end)
-{
- free_reserved_area((void *)start, (void *)end, -1, "initrd");
-}
-#endif
--- a/arch/powerpc/mm/mem.c~initramfs-proide-a-generic-free_initrd_mem-implementation
+++ a/arch/powerpc/mm/mem.c
@@ -333,13 +333,6 @@ void free_initmem(void)
free_initmem_default(POISON_FREE_INITMEM);
}
-#ifdef CONFIG_BLK_DEV_INITRD
-void __init free_initrd_mem(unsigned long start, unsigned long end)
-{
- free_reserved_area((void *)start, (void *)end, -1, "initrd");
-}
-#endif
-
/*
* This is called when a page has been modified by the kernel.
* It just marks the page as not i-cache clean. We do the i-cache
--- a/arch/sh/mm/init.c~initramfs-proide-a-generic-free_initrd_mem-implementation
+++ a/arch/sh/mm/init.c
@@ -408,13 +408,6 @@ void free_initmem(void)
free_initmem_default(-1);
}
-#ifdef CONFIG_BLK_DEV_INITRD
-void free_initrd_mem(unsigned long start, unsigned long end)
-{
- free_reserved_area((void *)start, (void *)end, -1, "initrd");
-}
-#endif
-
#ifdef CONFIG_MEMORY_HOTPLUG
int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap,
bool want_memblock)
--- a/arch/um/kernel/mem.c~initramfs-proide-a-generic-free_initrd_mem-implementation
+++ a/arch/um/kernel/mem.c
@@ -188,13 +188,6 @@ void free_initmem(void)
{
}
-#ifdef CONFIG_BLK_DEV_INITRD
-void free_initrd_mem(unsigned long start, unsigned long end)
-{
- free_reserved_area((void *)start, (void *)end, -1, "initrd");
-}
-#endif
-
/* Allocate and free page tables. */
pgd_t *pgd_alloc(struct mm_struct *mm)
--- a/arch/unicore32/mm/init.c~initramfs-proide-a-generic-free_initrd_mem-implementation
+++ a/arch/unicore32/mm/init.c
@@ -292,10 +292,3 @@ void free_initmem(void)
{
free_initmem_default(-1);
}
-
-#ifdef CONFIG_BLK_DEV_INITRD
-void free_initrd_mem(unsigned long start, unsigned long end)
-{
- free_reserved_area((void *)start, (void *)end, -1, "initrd");
-}
-#endif
--- a/init/initramfs.c~initramfs-proide-a-generic-free_initrd_mem-implementation
+++ a/init/initramfs.c
@@ -527,6 +527,11 @@ extern unsigned long __initramfs_size;
#include <linux/initrd.h>
#include <linux/kexec.h>
+void __weak free_initrd_mem(unsigned long start, unsigned long end)
+{
+ free_reserved_area((void *)start, (void *)end, -1, "initrd");
+}
+
#ifdef CONFIG_KEXEC_CORE
static bool kexec_free_initrd(void)
{
_
Patches currently in -mm which might be from hch@xxxxxx are
initramfs-free-initrd-memory-if-opening-initrdimage-fails.patch
initramfs-cleanup-initrd-freeing.patch
initramfs-factor-out-a-helper-to-populate-the-initrd-image.patch
initramfs-cleanup-populate_rootfs.patch
initramfs-move-the-legacy-keepinitrd-parameter-to-core-code.patch
initramfs-proide-a-generic-free_initrd_mem-implementation.patch
initramfs-poison-freed-initrd-memory.patch
