From patchwork Wed Mar 28 15:26:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shea Levy X-Patchwork-Id: 892282 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-snps-arc-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=shealevy.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="CJvcohei"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40BBbf3Npgz9rxs for ; Thu, 29 Mar 2018 02:28:14 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=I+T5TLRO5eauZ0QPPHpak0MSi2tWJ1er1kWsSFu5Vzo=; b=CJvcoheixkwhVZbmAAtMbwqGx7 fv2WP+iK/9WnMUcPlrBZc9xgbI0mrMRbH3YZr0mZnT8Qp1sru0DLs6EXlWJKfqRmp5mbhcr67wYW7 fCct+YsJO8DnwChzSWEIirKkXLY7UY83Z6RsyCNwYITvg1JJiMsWN5m0XIdOCoZfe8GLwvTpuNiXu 8HET3qeouxoGlYpgH8twd/P5kLzmVVW0ofJ2BTcv+X1o6IMxAO2qWAu19YJShxBkOg7tuW7lFgTYO 7vV9Nnou5epKR5rBR7feaeZYlg6HlzLRKI24WngOEgHbQQVY7myOH3oC1iRuLloy/c8PILKagV7UT mNv5wkXg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f1Czk-00060o-Fj; Wed, 28 Mar 2018 15:28:12 +0000 Received: from smtprelay0199.hostedemail.com ([216.40.44.199] helo=smtprelay.hostedemail.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f1Czg-0005zT-Pk; Wed, 28 Mar 2018 15:28:11 +0000 Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay01.hostedemail.com (Postfix) with ESMTP id 13280100E806B; Wed, 28 Mar 2018 15:27:55 +0000 (UTC) X-Session-Marker: 7368656140736865616C6576792E636F6D X-Spam-Summary: X-HE-Tag: coast46_7e8772a2fd911 X-Filterd-Recvd-Size: 20895 Received: from localhost (c-71-235-10-46.hsd1.nh.comcast.net [71.235.10.46]) (Authenticated sender: shea@shealevy.com) by omf11.hostedemail.com (Postfix) with ESMTPA; Wed, 28 Mar 2018 15:27:49 +0000 (UTC) From: Shea Levy To: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] Extract initrd free logic from arch-specific code. Date: Wed, 28 Mar 2018 11:26:51 -0400 Message-Id: <20180328152714.6103-1-shea@shealevy.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180325221853.10839-1-shea@shealevy.com> References: <20180325221853.10839-1-shea@shealevy.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180328_082809_017163_BD918BC2 X-CRM114-Status: GOOD ( 12.24 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [216.40.44.199 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: linux-snps-arc@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux on Synopsys ARC Processors List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-mips@linux-mips.org, linux-sh@vger.kernel.org, Benjamin Herrenschmidt , Linus Walleij , Will Deacon , Paul Mackerras , Michael Ellerman , "James E.J. Bottomley" , Christoph Hellwig , Geert Uytterhoeven , Catalin Marinas , Matt Turner , Eugeniy Paltsev , uclinux-h8-devel@lists.sourceforge.jp, Vladimir Murzin , Marc Zyngier , adi-buildroot-devel@lists.sourceforge.net, Al Viro , Thomas Gleixner , Richard Henderson , linux-cris-kernel@axis.com, Greg Kroah-Hartman , Ralf Baechle , Richard Kuo , Joe Perches , Andrew Morton , linux-ia64@vger.kernel.org, James Hogan , Palmer Dabbelt , Max Filippov , Oliver O'Halloran , Deepa Dinamani , Chen Liqin , Jesper Nilsson , linux-c6x-dev@linux-c6x.org, Yoshinori Sato , "David S. Miller" , linux-hexagon@vger.kernel.org, Helge Deller , linux-xtensa@linux-xtensa.org, Albert Ou , Philippe Ombredanne , Aurelien Jacquiot , linux-m68k@lists.linux-m68k.org, Stafford Horne , linux-metag@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Chris Zankel , Tony Luck , Sudip Mukherjee , Martin Schwidefsky , Kate Stewart , Heiko Carstens , Michal Hocko , Guan Xuetao , Lennox Wu , Rob Herring , Daniel Thompson , Florian Fainelli , linux-snps-arc@lists.infradead.org, Fenghua Yu , Kees Cook , Arnd Bergmann , Jeff Dike , Ivan Kokshaysky , Dan Williams , linux-parisc@vger.kernel.org, Rob Landley , linux-alpha@vger.kernel.org, Ley Foon Tan , =?utf-8?q?Christian_K=C3=B6nig?= , Rich Felker , Balbir Singh , Wei Yang , David Howells , "H. Peter Anvin" , sparclinux@vger.kernel.org, Jonas Bonn , linux-am33-list@redhat.com, Richard Weinberger , x86@kernel.org, Russell King , Shea Levy , Ingo Molnar , Mark Salter , user-mode-linux-devel@lists.sourceforge.net, linux-s390@vger.kernel.org, Stefan Kristiansson , Mikael Starvik , openrisc@lists.librecores.org, user-mode-linux-user@lists.sourceforge.net, Vlastimil Babka , Christophe Leroy , Michal Simek , Vineet Gupta , nios2-dev@lists.rocketboards.org, linuxppc-dev@lists.ozlabs.org MIME-Version: 1.0 Sender: "linux-snps-arc" Errors-To: linux-snps-arc-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Now only those architectures that have custom initrd free requirements need to define free_initrd_mem. Signed-off-by: Shea Levy Signed-off-by: Russell King --- arch/alpha/mm/init.c | 8 -------- arch/arc/mm/init.c | 7 ------- arch/arm/Kconfig | 1 + arch/arm64/Kconfig | 1 + arch/blackfin/Kconfig | 1 + arch/c6x/mm/init.c | 7 ------- arch/cris/Kconfig | 1 + arch/frv/mm/init.c | 11 ----------- arch/h8300/mm/init.c | 7 ------- arch/hexagon/Kconfig | 1 + arch/ia64/Kconfig | 1 + arch/m32r/Kconfig | 1 + arch/m32r/mm/init.c | 11 ----------- arch/m68k/mm/init.c | 7 ------- arch/metag/Kconfig | 1 + arch/microblaze/mm/init.c | 7 ------- arch/mips/Kconfig | 1 + arch/mn10300/Kconfig | 1 + 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/riscv/mm/init.c | 6 ------ arch/s390/Kconfig | 1 + arch/score/Kconfig | 1 + arch/sh/mm/init.c | 7 ------- arch/sparc/Kconfig | 1 + arch/tile/Kconfig | 1 + arch/um/kernel/mem.c | 7 ------- arch/unicore32/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/xtensa/Kconfig | 1 + init/initramfs.c | 7 +++++++ usr/Kconfig | 4 ++++ 34 files changed, 28 insertions(+), 113 deletions(-) diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c index 9d74520298ab..55f7c8efa962 100644 --- a/arch/alpha/mm/init.c +++ b/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 diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c index ba145065c579..7bcf23ab1756 100644 --- a/arch/arc/mm/init.c +++ b/arch/arc/mm/init.c @@ -229,10 +229,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 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3f972e83909b..19d1c5594e2d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -47,6 +47,7 @@ config ARM select HARDIRQS_SW_RESEND select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT) select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6 + select HAVE_ARCH_FREE_INITRD_MEM select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU select HAVE_ARCH_MMAP_RND_BITS if MMU diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index cb03e93f03cf..de93620870af 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -85,6 +85,7 @@ config ARM64 select HAVE_ALIGNED_STRUCT_PAGE if SLUB select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_BITREVERSE + select HAVE_ARCH_FREE_INITRD_MEM select HAVE_ARCH_HUGE_VMAP select HAVE_ARCH_JUMP_LABEL select HAVE_ARCH_KASAN if !(ARM64_16K_PAGES && ARM64_VA_BITS_48) diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index d9c2866ba618..6c6dae9fe894 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig @@ -15,6 +15,7 @@ config BLACKFIN def_bool y select HAVE_ARCH_KGDB select HAVE_ARCH_TRACEHOOK + select HAVE_ARCH_FREE_INITRD_MEM select HAVE_DYNAMIC_FTRACE select HAVE_FTRACE_MCOUNT_RECORD select HAVE_FUNCTION_GRAPH_TRACER diff --git a/arch/c6x/mm/init.c b/arch/c6x/mm/init.c index 4cc72b0d1c1d..a11cb657182a 100644 --- a/arch/c6x/mm/init.c +++ b/arch/c6x/mm/init.c @@ -66,13 +66,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); diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index cd5a0865c97f..5425f77e5664 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig @@ -76,6 +76,7 @@ config CRIS select HAVE_DEBUG_BUGVERBOSE if ETRAX_ARCH_V32 select HAVE_NMI select DMA_DIRECT_OPS if PCI + select HAVE_ARCH_FREE_INITRD_MEM config HZ int diff --git a/arch/frv/mm/init.c b/arch/frv/mm/init.c index cf464100e838..345edc4dc462 100644 --- a/arch/frv/mm/init.c +++ b/arch/frv/mm/init.c @@ -131,14 +131,3 @@ void free_initmem(void) free_initmem_default(-1); #endif } /* end free_initmem() */ - -/*****************************************************************************/ -/* - * free the initial ramdisk memory - */ -#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"); -} /* end free_initrd_mem() */ -#endif diff --git a/arch/h8300/mm/init.c b/arch/h8300/mm/init.c index 015287ac8ce8..37574332b202 100644 --- a/arch/h8300/mm/init.c +++ b/arch/h8300/mm/init.c @@ -102,13 +102,6 @@ void __init mem_init(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 - void free_initmem(void) { diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig index 76d2f20d525e..69a16cd2e253 100644 --- a/arch/hexagon/Kconfig +++ b/arch/hexagon/Kconfig @@ -17,6 +17,7 @@ config HEXAGON # GENERIC_ALLOCATOR is used by dma_alloc_coherent() select GENERIC_ALLOCATOR select GENERIC_IRQ_SHOW + select HAVE_ARCH_FREE_INITRD_MEM select HAVE_ARCH_KGDB select HAVE_ARCH_TRACEHOOK select NO_IOPORT_MAP diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index bbe12a038d21..366ef1dd3cd4 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -28,6 +28,7 @@ config IA64 select HAVE_DYNAMIC_FTRACE if (!ITANIUM) select HAVE_FUNCTION_TRACER select TTY + select HAVE_ARCH_FREE_INITRD_MEM select HAVE_ARCH_TRACEHOOK select HAVE_DMA_API_DEBUG select HAVE_MEMBLOCK diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index dd84ee194579..9e41bdff45c3 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig @@ -21,6 +21,7 @@ config M32R select CPU_NO_EFFICIENT_FFS select DMA_DIRECT_OPS select ARCH_NO_COHERENT_DMA_MMAP if !MMU + select HAVE_ARCH_FREE_INITRD_MEM config SBUS bool diff --git a/arch/m32r/mm/init.c b/arch/m32r/mm/init.c index 93abc8c3a46e..e2b5f09209ee 100644 --- a/arch/m32r/mm/init.c +++ b/arch/m32r/mm/init.c @@ -139,14 +139,3 @@ void free_initmem(void) { free_initmem_default(-1); } - -#ifdef CONFIG_BLK_DEV_INITRD -/*======================================================================* - * free_initrd_mem() : - * orig : arch/sh/mm/init.c - *======================================================================*/ -void free_initrd_mem(unsigned long start, unsigned long end) -{ - free_reserved_area((void *)start, (void *)end, -1, "initrd"); -} -#endif diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c index e85acd131fa8..e20bef09258c 100644 --- a/arch/m68k/mm/init.c +++ b/arch/m68k/mm/init.c @@ -172,10 +172,3 @@ void __init mem_init(void) mem_init_print_info(NULL); print_memmap(); } - -#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 diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig index c7b62a339539..5be7f1693b1b 100644 --- a/arch/metag/Kconfig +++ b/arch/metag/Kconfig @@ -7,6 +7,7 @@ config METAG select GENERIC_IRQ_SHOW select GENERIC_SMP_IDLE_THREAD select HAVE_64BIT_ALIGNED_ACCESS + select HAVE_ARCH_FREE_INITRD_MEM select HAVE_ARCH_TRACEHOOK select HAVE_C_RECORDMCOUNT select HAVE_DEBUG_KMEMLEAK diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c index df6de7ccdc2e..ea058dfda222 100644 --- a/arch/microblaze/mm/init.c +++ b/arch/microblaze/mm/init.c @@ -187,13 +187,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); diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 8128c3b68d6b..c033cd1e0c52 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -27,6 +27,7 @@ config MIPS select GENERIC_SMP_IDLE_THREAD select GENERIC_TIME_VSYSCALL select HANDLE_DOMAIN_IRQ + select HAVE_ARCH_FREE_INITRD_MEM select HAVE_ARCH_JUMP_LABEL select HAVE_ARCH_KGDB select HAVE_ARCH_MMAP_RND_BITS if MMU diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig index e9d8d60bd28b..5aa4f1aa309f 100644 --- a/arch/mn10300/Kconfig +++ b/arch/mn10300/Kconfig @@ -6,6 +6,7 @@ config MN10300 select HAVE_UID16 select GENERIC_IRQ_SHOW select ARCH_WANT_IPC_PARSE_VERSION + select HAVE_ARCH_FREE_INITRD_MEM select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_KGDB select GENERIC_ATOMIC64 diff --git a/arch/nios2/mm/init.c b/arch/nios2/mm/init.c index c92fe4234009..3df75ff8c768 100644 --- a/arch/nios2/mm/init.c +++ b/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); diff --git a/arch/openrisc/mm/init.c b/arch/openrisc/mm/init.c index 6972d5d6f23f..c1a3dcf9ad40 100644 --- a/arch/openrisc/mm/init.c +++ b/arch/openrisc/mm/init.c @@ -222,13 +222,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); diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index cab32ee824d2..3643399230f3 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c @@ -932,10 +932,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 diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index fe8c61149fb8..e85b2a3cd264 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -404,13 +404,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 diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index c77df8142be2..36f83fe8a726 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -62,9 +62,3 @@ void free_initmem(void) { free_initmem_default(0); } - -#ifdef CONFIG_BLK_DEV_INITRD -void free_initrd_mem(unsigned long start, unsigned long end) -{ -} -#endif /* CONFIG_BLK_DEV_INITRD */ diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index eaee7087886f..94a9879f1ea8 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -125,6 +125,7 @@ config S390 select GENERIC_TIME_VSYSCALL select HAVE_ALIGNED_STRUCT_PAGE if SLUB select HAVE_ARCH_AUDITSYSCALL + select HAVE_ARCH_FREE_INITRD_MEM select HAVE_ARCH_JUMP_LABEL select CPU_NO_EFFICIENT_FFS if !HAVE_MARCH_Z9_109_FEATURES select HAVE_ARCH_SECCOMP_FILTER diff --git a/arch/score/Kconfig b/arch/score/Kconfig index d881f99c9ddd..2beff03b2429 100644 --- a/arch/score/Kconfig +++ b/arch/score/Kconfig @@ -16,6 +16,7 @@ config SCORE select MODULES_USE_ELF_REL select CLONE_BACKWARDS select CPU_NO_EFFICIENT_FFS + select HAVE_ARCH_FREE_INITRD_MEM choice prompt "System type" diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index ce0bbaa7e404..7451459d0725 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c @@ -477,13 +477,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) diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 8767e45f1b2b..06d543e35caf 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -18,6 +18,7 @@ config SPARC select OF_PROMTREE select HAVE_IDE select HAVE_OPROFILE + select HAVE_ARCH_FREE_INITRD_MEM select HAVE_ARCH_KGDB if !SMP || SPARC64 select HAVE_ARCH_TRACEHOOK select HAVE_EXIT_THREAD diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig index ef9d403cbbe4..7fb36c15762c 100644 --- a/arch/tile/Kconfig +++ b/arch/tile/Kconfig @@ -16,6 +16,7 @@ config TILE select GENERIC_PENDING_IRQ if SMP select GENERIC_STRNCPY_FROM_USER select GENERIC_STRNLEN_USER + select HAVE_ARCH_FREE_INITRD_MEM select HAVE_ARCH_SECCOMP_FILTER select HAVE_ARCH_TRACEHOOK select HAVE_CONTEXT_TRACKING diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c index 3c0e470ea646..2d26eec92126 100644 --- a/arch/um/kernel/mem.c +++ b/arch/um/kernel/mem.c @@ -170,13 +170,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) diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig index 462e59a7ae78..4da24cf467de 100644 --- a/arch/unicore32/Kconfig +++ b/arch/unicore32/Kconfig @@ -4,6 +4,7 @@ config UNICORE32 select ARCH_HAS_DEVMEM_IS_ALLOWED select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO + select HAVE_ARCH_FREE_INITRD_MEM select HAVE_MEMBLOCK select HAVE_GENERIC_DMA_COHERENT select HAVE_KERNEL_GZIP diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 0fa71a78ec99..51ce64e6d848 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -111,6 +111,7 @@ config X86 select HAVE_ALIGNED_STRUCT_PAGE if SLUB select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_HUGE_VMAP if X86_64 || X86_PAE + select HAVE_ARCH_FREE_INITRD_MEM select HAVE_ARCH_JUMP_LABEL select HAVE_ARCH_KASAN if X86_64 select HAVE_ARCH_KGDB diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index c921e8bccdc8..01a4a0e42118 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -16,6 +16,7 @@ config XTENSA select GENERIC_PCI_IOMAP select GENERIC_SCHED_CLOCK select GENERIC_STRNCPY_FROM_USER if KASAN + select HAVE_ARCH_FREE_INITRD_MEM select HAVE_ARCH_KASAN if MMU select HAVE_CC_STACKPROTECTOR select HAVE_DEBUG_KMEMLEAK diff --git a/init/initramfs.c b/init/initramfs.c index 7e99a0038942..d319058eb464 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -526,6 +526,13 @@ extern unsigned long __initramfs_size; #include #include +#ifndef CONFIG_HAVE_ARCH_FREE_INITRD_MEM +void __init free_initrd_mem(unsigned long start, unsigned long end) +{ + free_reserved_area((void *)start, (void *)end, -1, "initrd"); +} +#endif + static void __init free_initrd(void) { #ifdef CONFIG_KEXEC_CORE diff --git a/usr/Kconfig b/usr/Kconfig index 43658b8a975e..7a94f6df39bf 100644 --- a/usr/Kconfig +++ b/usr/Kconfig @@ -233,3 +233,7 @@ config INITRAMFS_COMPRESSION default ".lzma" if RD_LZMA default ".bz2" if RD_BZIP2 default "" + +config HAVE_ARCH_FREE_INITRD_MEM + bool + default n