From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 71829CAC58F for ; Sun, 14 Sep 2025 05:31:03 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4cPcFy11H2z3cjS; Sun, 14 Sep 2025 15:31:02 +1000 (AEST) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip="2a00:1450:4864:20::62f" ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1757821908; cv=none; b=iMzBY7D86X/wC4BLS7Dip3AC5Bos+81PPkRzIhXqG9kq42sig/Y6A6hbbJT2N1+e3W1UKvPkyxx+As6gx6EdUF2qoaBJmGHLiZS8FAL7I6Hc871cez905VA5Egh+PE/5S6vRMcN2Xs3xeb3XIt0j2OQlfA6RVhfE1MBTGDp331+VmhuCMcNd/IU6LdBNr5fCB9IVajKKJeXzQGUPbb4OsJr1ROcSRqQagIChsczs5izz/YgvBRAKQiz0MZYZescv3gkOow6bhG4VsmNbee3URRXaQoRKlpG9bY9viWsWI+7A0JbjPPm6AlAckw7LQjixC94TyPBqZ53nUlhb74ACXw== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1757821908; c=relaxed/relaxed; bh=eXT46s/O30O5D6iGHqIIZ8OQqeCOoCO9YfqStJzQ+0w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=McYs2ckrCXdI7hZtxGYXMCig3cGcJLW26iSSUd6obwLnq/5IFd3IYsgMk45ulHuU6oYnxD9v18nmBKef3czhhSBbkaPCi4ILaDftqjqgfavEeOJI/xXNz/9zlHGfwMbj9K50w8FpHNV4WcjRmCVC6OHS/6SKuAplDuAdvFb6A3qTye2a0/6xZr0sOwP3Hie0OrnTTRqRcbONQA+l33Zk7qZetZr5yi8NRy1C9FjJrz9gD0r84ap4q0fBiZYQlo5v6zKV7YDMuePde7NFPnH4K1xAi+ZAfSof7ew+cseXm/wmTTTkKvK+ipipEh/ahZrRVKySOUBDn4OzE+zpng3Y1g== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=mrKLJvLV; dkim-atps=neutral; spf=pass (client-ip=2a00:1450:4864:20::62f; helo=mail-ej1-x62f.google.com; envelope-from=safinaskar@gmail.com; receiver=lists.ozlabs.org) smtp.mailfrom=gmail.com Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=mrKLJvLV; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2a00:1450:4864:20::62f; helo=mail-ej1-x62f.google.com; envelope-from=safinaskar@gmail.com; receiver=lists.ozlabs.org) Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4cPZ3R58Dmz2yrg for ; Sun, 14 Sep 2025 13:51:47 +1000 (AEST) Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-b0415e03e25so404342566b.0 for ; Sat, 13 Sep 2025 20:51:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757821905; x=1758426705; darn=lists.ozlabs.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eXT46s/O30O5D6iGHqIIZ8OQqeCOoCO9YfqStJzQ+0w=; b=mrKLJvLV8lCNQFXjosY1xMvjWg3oFmndvP5HpwuF5vw+Mk4esA0ScbJpkw8SoYxh7S TqOiji2hPkzCJMB1XYHMR2y8c21GA0Km/oGm+0Ox1vn3j1VZZ2vBKChxMrxvKbg3ztjn FeqmjEBXgIGP+qvgHmQ/j0hcwpj6Ca+aMrgoMeAvsslhutj0INFXLK8WUDoMd1/DpB98 GEknV5bpcZ4WpclT6o+Pvk7ueLmHBMtcvYqfrVSdp3dm8zZ6KbYMh9DJRTs7lKTQibV9 9c90/JCz1jQSC6o/lx8+7CsCRwluH5e0BAAE0LZJPmj03lD8c6S1mLNG7URMSAKwfo6V BFZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757821905; x=1758426705; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eXT46s/O30O5D6iGHqIIZ8OQqeCOoCO9YfqStJzQ+0w=; b=gisvU/wbXJzXlxJMrCv2GkzsSC9b2rg4rcM8/GKft9sAowAfKbw8jbOxum5Uow4Jsh oWL4T+IHiOOpjT6hq1A+UlqgNd7Fnhj5Y0BJlbPFFIPhrWdqDFT1Pw0mFvKJY0UnU2Nd JxS4RcE6IvQ7OomgpZ1/0WLFtfc9uFAXF+6EY8bqhUJ/0KzR4wcCkH/iz0MW2okYAxLi g8Cw/aR3CTDO0QeUNnBnudgqvByFSCYmT1j+4YyHI0kC7UW/BJdp+ZGSFb2ygczA9g/f 0cahwZglQYp5jztf2en/ysHfyXLMsYJpxq5qRWWdyu0GwfwBFdvaPjyYTU56mRqAugDE xnMQ== X-Forwarded-Encrypted: i=1; AJvYcCXrV9y4JSr6sOpckcA+P6iScsOEqwUv+2p82Dkcm8aYVPIGC3UGk8Wh3XGnVC13drhFGlpxmvC+hKPCso0=@lists.ozlabs.org X-Gm-Message-State: AOJu0YzFNAsBHkBrDXEIorZS4L2GjWcizxGtVEFwozg3t7hAF43Eagk4 JnEOUUsjeEYG31V6J/sy9V9ensHAoyBIIBcK/7OfyIjmBRj6GpIBAS31 X-Gm-Gg: ASbGncsG9Q2PihXdiRZSzQ8/qPr+oSFSjB+8G0GkQCQza9acAVMzzj5jfYorq0EoMNW lSO/X0BAOnX21/UE5SVMlJ6ZSh8zSswfZ5iQiyhblKh+hZWtB7fQ84fZ0Kicqe+sp6EB48I9I0W EGDNKvpqysm5FlR3ar/MbxdkZAepVkNRIn+6y7REXAoh10olsldV4vM6/SJinStEVtS3T7kWDvh Dr1T5V11fQrO+CQnnFY78jkGMp4pDvO/+C3xzbV/SlNCLcUf2+9QJ3a8Fau52FW5HOBEVCMVJFy 8Xsy5POR7Dik2C7DC/EwyD6J05qn9T2FSXYsL190GvbdKazM/8z/Zrrh1uiHwQGSG45AuDdsMJP dhNGF2ptiF6YryE8FEwk= X-Google-Smtp-Source: AGHT+IEAFUpwy9YyLhSCGMZ/kQuTAA3iwfbEpQd1MDgVvquhbXlSq99pqpi7zF/bJ0OEdeyJIf4Tkg== X-Received: by 2002:a17:907:3f07:b0:b04:7ad5:b567 with SMTP id a640c23a62f3a-b07c35be704mr853139866b.16.1757821904788; Sat, 13 Sep 2025 20:51:44 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b32f35cdsm661712966b.92.2025.09.13.20.51.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 13 Sep 2025 20:51:43 -0700 (PDT) From: Askar Safin To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linus Torvalds , Greg Kroah-Hartman , Christian Brauner , Al Viro , Jan Kara , Christoph Hellwig , Jens Axboe , Andy Shevchenko , Aleksa Sarai , =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , Julian Stecklina , Gao Xiang , Art Nikpal , Andrew Morton , Eric Curtin , Alexander Graf , Rob Landley , Lennart Poettering , linux-arch@vger.kernel.org, linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-openrisc@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, x86@kernel.org, Ingo Molnar , linux-block@vger.kernel.org, initramfs@vger.kernel.org, linux-api@vger.kernel.org, linux-doc@vger.kernel.org, linux-efi@vger.kernel.org, linux-ext4@vger.kernel.org, "Theodore Y . Ts'o" , linux-acpi@vger.kernel.org, Michal Simek , devicetree@vger.kernel.org, Luis Chamberlain , Kees Cook , Thorsten Blum , Heiko Carstens , patches@lists.linux.dev Subject: [PATCH RESEND 40/62] init: rename free_initrd_mem to free_initramfs_mem Date: Sun, 14 Sep 2025 06:51:38 +0300 Message-ID: <20250914035138.3631173-1-safinaskar@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com> References: <20250913003842.41944-1-safinaskar@gmail.com> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This is cleanup after initrd removal Signed-off-by: Askar Safin --- arch/arm/mm/init.c | 2 +- arch/x86/mm/init.c | 2 +- include/linux/initrd.h | 2 +- init/initramfs.c | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 4faeec51c522..290e9f9874c9 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -437,7 +437,7 @@ void free_initmem(void) } #ifdef CONFIG_BLK_DEV_INITRD -void free_initrd_mem(unsigned long start, unsigned long end) +void free_initramfs_mem(unsigned long start, unsigned long end) { if (start == virt_external_initramfs_start) start = round_down(start, PAGE_SIZE); diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index bb57e93b4caf..c7ca996fb430 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -981,7 +981,7 @@ void __ref free_initmem(void) } #ifdef CONFIG_BLK_DEV_INITRD -void __init free_initrd_mem(unsigned long start, unsigned long end) +void __init free_initramfs_mem(unsigned long start, unsigned long end) { /* * end could be not aligned, and We can not align that, diff --git a/include/linux/initrd.h b/include/linux/initrd.h index 55239701c4e0..b2a0128c3438 100644 --- a/include/linux/initrd.h +++ b/include/linux/initrd.h @@ -7,7 +7,7 @@ extern int initramfs_below_start_ok; extern unsigned long virt_external_initramfs_start, virt_external_initramfs_end; -extern void free_initrd_mem(unsigned long, unsigned long); +extern void free_initramfs_mem(unsigned long, unsigned long); #ifdef CONFIG_BLK_DEV_INITRD extern void __init reserve_initrd_mem(void); diff --git a/init/initramfs.c b/init/initramfs.c index 8ed352721a79..7a050e54ff1a 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -642,7 +642,7 @@ void __init reserve_initrd_mem(void) if (!phys_external_initramfs_size) return; /* - * Round the memory region to page boundaries as per free_initrd_mem() + * Round the memory region to page boundaries as per free_initramfs_mem() * This allows us to detect whether the pages overlapping the initrd * are in use, but more importantly, reserves the entire set of pages * as we don't want these pages allocated for other purposes. @@ -676,7 +676,7 @@ void __init reserve_initrd_mem(void) virt_external_initramfs_end = 0; } -void __weak __init free_initrd_mem(unsigned long start, unsigned long end) +void __weak __init free_initramfs_mem(unsigned long start, unsigned long end) { #ifdef CONFIG_ARCH_KEEP_MEMBLOCK unsigned long aligned_start = ALIGN_DOWN(start, PAGE_SIZE); @@ -707,9 +707,9 @@ static bool __init kexec_free_initrd(void) */ memset((void *)virt_external_initramfs_start, 0, virt_external_initramfs_end - virt_external_initramfs_start); if (virt_external_initramfs_start < crashk_start) - free_initrd_mem(virt_external_initramfs_start, crashk_start); + free_initramfs_mem(virt_external_initramfs_start, crashk_start); if (virt_external_initramfs_end > crashk_end) - free_initrd_mem(crashk_end, virt_external_initramfs_end); + free_initramfs_mem(crashk_end, virt_external_initramfs_end); return true; } #else @@ -744,7 +744,7 @@ static void __init do_populate_rootfs(void *unused, async_cookie_t cookie) * free only memory that is not part of crashkernel region. */ if (!do_retain_initrd && virt_external_initramfs_start && !kexec_free_initrd()) { - free_initrd_mem(virt_external_initramfs_start, virt_external_initramfs_end); + free_initramfs_mem(virt_external_initramfs_start, virt_external_initramfs_end); } else if (do_retain_initrd && virt_external_initramfs_start) { bin_attr_initrd.size = virt_external_initramfs_end - virt_external_initramfs_start; bin_attr_initrd.private = (void *)virt_external_initramfs_start; -- 2.47.2