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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 5A29DCAC592 for ; Sun, 14 Sep 2025 03:52:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ji/7LeyyXA3A1wf+r0NloCDgCP9kYwAbhvqoNAjAUZw=; b=ZAf3a6D1KQdL/eXJBSKhrGKtZV Ntn1iJwpYJNO95mXsmACglidZjUTjUWObJ/iEmXIQcXn55t5/Ke+QbANu8uLmk4iT7ER9jLm8E4ah oqJbSiSpk2wq3r0pfUbCEtMkXSdM0Pv4YDhd4t+FTwErqWrqdQeyP81aLGs6XokvjqNkKmezX8P78 ZXa0gZMmam9QxQwDH85Q9YAVj1aybDIBRTmyPTkZQ5qeR2SM29en8U8HTFJ/nnR7DAdg6JVIsRNfb 642lQlpDf9q4mCHpm5yw1XyyRi23Sm2raA9cN72lX1gXFT0K9+VNeZQf0wo0VV9suwyZCgxC0JIxp 6zdIinMw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uxdmr-0000000HM3a-02Zl; Sun, 14 Sep 2025 03:52:25 +0000 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uxdmo-0000000HLzv-0gUW for linux-um@lists.infradead.org; Sun, 14 Sep 2025 03:52:23 +0000 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-b07dac96d1eso212407166b.1 for ; Sat, 13 Sep 2025 20:52:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757821940; x=1758426740; darn=lists.infradead.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=ji/7LeyyXA3A1wf+r0NloCDgCP9kYwAbhvqoNAjAUZw=; b=gDez8bQiwVTEA1xSrhw0aDZx4gpAahu1lFz2uDaAex5LIgvS39kEkPqTfn5nFrWTQD ZTykEjEwDxJYVxjxOdz4nqe468tsa2xBRD17qocoPvRThmI3qjoCjGEtlnNVE+oK9IPX jb2/OeQX9aoZw9L4Gc+AFOAqKmuwZ080VMmHFEwRqii1lRnEjTYPtRhtmnVr8Fbt7zvD DxjZOJdOMt0ASv1UqYhCBY9Rh+p7GfkUWr7xG32fWVuz2cM6bQN2zT9TSyL1/iu0P4oA fXWieml8sjlojHV0VymMnTlRfViZtAuce4g+2WvNZmoX+Dcy+FcgOjBAyo8thTV/+0JT HYjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757821940; x=1758426740; 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=ji/7LeyyXA3A1wf+r0NloCDgCP9kYwAbhvqoNAjAUZw=; b=PjC8L9xCD6Nbvzaua/sCDQCoLaRW43AMf9fQqnWf21Qp8GkjvY6diScm8Lt4EqjIVF MjAs6d/YCEGfc9dXSFHiO6YVcOuFZQcislMv0NzoDXvlRJd73HEAvjAGnmLsuOWPCzGc qG2swKtmWW2+W24yN4CwOoKZycoLwEE3lvUvtkQ3ztrr2P4QGhzgD9fxQh2AwdxqZWdJ Ja7qeCsqVzPJHIKw0ifgLF231n7ytnDg7hn6E2nbgIasmSyTypmlCUPdSfK8TxN15aJg +LqvcPJ0jWwZYoWuy9x80jd5av5gwU+Ok1BWrvwFoj/0s/EvuEIBch4M849blb7Irwv6 k0ww== X-Forwarded-Encrypted: i=1; AJvYcCUrCLIOKAV9QajgYMSdNxW17mo7tZOEbUMUlYhJRku+4+dlOR+DP44mxrWjX9tza3n8csmPFOF2ow==@lists.infradead.org X-Gm-Message-State: AOJu0YwxmBR7w2GL6b1+aX1cJHizpTHVbFXxJ6uetw1ucbhD5LRCWNYF ZJie5K2sNhLkbJg6vgwiihYGtRzJqX0Umr5D6i1yj7wSB8iKNe01WU3I X-Gm-Gg: ASbGncsFjif+SIZPlS66LuAeXCY05f+0U7qOXBNdduiKeYDe6vxtmv8jCrS8LYtNZ7p swvMHRSUvxwy01OPEYycX26a0RDMDygJLRR28dqOXjFincQj+yZ86qdYec6NIMkzrV3SQZ9NfLB StWW0XYrLwDsAoYIWTZM/83o8v2X1ukuZnzZ55WForb7HL6RGUJwO3BuJ+yO+62fO1FUC9n4UoD nm823U/LKXaUkAsF+YbRu2c5qsEzrtGPf78pj/TDsPOEg3JUC79JwFYXSaVOPLLBLMxVl4ITNBE ZZYk3vpNbi1xCmuEXSVFk1SrdrUSWUWjHUhX/tpZsa7bmA3/UIY03G3KKfmb48+G/1ShxUCiQ3c 5p+kW0fXMNQrAp5DHFI0= X-Google-Smtp-Source: AGHT+IFrowlqfzYJmQGTHyfqsFCL1BbKqEywr8+/6hRK49j3T1AOHulukHNAqoGa7PMdZRPYrPs7MA== X-Received: by 2002:a17:907:3da2:b0:b04:6157:43b with SMTP id a640c23a62f3a-b07c2544bb9mr854247466b.25.1757821940418; Sat, 13 Sep 2025 20:52:20 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b32dd88fsm669745266b.51.2025.09.13.20.52.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 13 Sep 2025 20:52:20 -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 41/62] init: rename reserve_initrd_mem to reserve_initramfs_mem Date: Sun, 14 Sep 2025 06:52:15 +0300 Message-ID: <20250914035215.3641628-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> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250913_205222_223361_65A03E05 X-CRM114-Status: GOOD ( 13.51 ) X-BeenThere: linux-um@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-um" Errors-To: linux-um-bounces+linux-um=archiver.kernel.org@lists.infradead.org This is cleanup after initrd removal Signed-off-by: Askar Safin --- arch/arm/mm/init.c | 2 +- arch/loongarch/kernel/setup.c | 2 +- arch/riscv/mm/init.c | 2 +- include/linux/initrd.h | 4 ++-- init/initramfs.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 290e9f9874c9..a564cbc36d18 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -186,7 +186,7 @@ void __init arm_memblock_init(const struct machine_desc *mdesc) /* Register the kernel text, kernel data and initrd with memblock. */ memblock_reserve(__pa(KERNEL_START), KERNEL_END - KERNEL_START); - reserve_initrd_mem(); + reserve_initramfs_mem(); arm_mm_memblock_reserve(); diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setup.c index 075b79b2c1d3..226262f35dc1 100644 --- a/arch/loongarch/kernel/setup.c +++ b/arch/loongarch/kernel/setup.c @@ -602,7 +602,7 @@ void __init setup_arch(char **cmdline_p) pagetable_init(); bootcmdline_init(cmdline_p); parse_early_param(); - reserve_initrd_mem(); + reserve_initramfs_mem(); platform_init(); arch_mem_init(cmdline_p); diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 15683ae13fa5..b1c4876dadae 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -295,7 +295,7 @@ static void __init setup_bootmem(void) dma32_phys_limit = min(4UL * SZ_1G, (unsigned long)PFN_PHYS(max_low_pfn)); - reserve_initrd_mem(); + reserve_initramfs_mem(); /* * No allocation should be done before reserving the memory as defined diff --git a/include/linux/initrd.h b/include/linux/initrd.h index b2a0128c3438..51c473b6a973 100644 --- a/include/linux/initrd.h +++ b/include/linux/initrd.h @@ -10,10 +10,10 @@ extern unsigned long virt_external_initramfs_start, virt_external_initramfs_end; extern void free_initramfs_mem(unsigned long, unsigned long); #ifdef CONFIG_BLK_DEV_INITRD -extern void __init reserve_initrd_mem(void); +extern void __init reserve_initramfs_mem(void); extern void wait_for_initramfs(void); #else -static inline void __init reserve_initrd_mem(void) {} +static inline void __init reserve_initramfs_mem(void) {} static inline void wait_for_initramfs(void) {} #endif diff --git a/init/initramfs.c b/init/initramfs.c index 7a050e54ff1a..a6c11260e62b 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -631,7 +631,7 @@ early_param("initrd", early_initrd); static BIN_ATTR(initrd, 0440, sysfs_bin_attr_simple_read, NULL, 0); -void __init reserve_initrd_mem(void) +void __init reserve_initramfs_mem(void) { phys_addr_t start; unsigned long size; -- 2.47.2