From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 015232459F3 for ; Sun, 14 Sep 2025 03:52:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757821945; cv=none; b=RS6LvVH1MwJ39JKZtAqi2ZefeZFXRvy0DmjMYkB2WND+jAN1OH9wNGCAplsgBz1LQ8SitMgm5oJSL73TO9AwOZbIlSRKm266C8DL5MDXjmeOQoKabPMpsz3D9Sp1hA//MSTJ5CTt1aAXQy58e7JScmtLEUK9yxbOwURkgiG+gOc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757821945; c=relaxed/simple; bh=UZLn6ULQgc/FnEmwCGdDgCcEQNlktPyYM0GENq2QFck=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lTnfig2MGg78n1f+SzQMlAfSsyBZmaY12HdUNxvOhEpm2ObTQn+MeqRC/EWrCQeatZqYBf3UvCt6WXkhdzzsnAFHQ2rSTwu9ctobbowUne3R6XZqty8Hx6qRWZiRCWmK5WZPzw1wZeD6CrohrbFrPneqVbvtc1UkOFJdG4AVyFs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Dtj5OhTs; arc=none smtp.client-ip=209.85.218.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Dtj5OhTs" Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-b07e3a77b72so134267966b.0 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=vger.kernel.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=Dtj5OhTsBzQk3sJ5Qvo5Cj1p0EESJX2lCq88wE1ffN4FbLgUYpOsA57Kqcs2YB96oS +0LkAdWToxZIBKUlf3ATRppWIqmTVhFIdFdQMHWcwvuD/l7bfRSKLiu7aE6ESdnXEpDW HbkaJDABKAPcz+tvW0LuHx5daig5XpPoBA6x6MHtPj9U4ZrB6FN//gU+4xilJjo9FqR4 /BJB8SSVvIXGPRLOT2TWSOxx1kVgdA4FJFgEFufUhw8YnGWJuW/VYk5uYBOH38KGQWQN 6QCffW0uulyxZAasYxWkIfBCOgzcm94JIzcKRGRtUH5hfwjUf7vaGWaFXQEi8nx3xZwJ v0IQ== 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=XrkwdITpZTEp+ZwlMtmxSB88Hhbby+EhfiTx/3ffVXzfd+X7gsau2MhUEHKriDy3VA bNyNfvvm4LupQTzQsrh6VLgadoVpwoXHvvVmKLCYTV3TGKA27DcyCW4fWeqBPc6Ujzv+ DzgwaN1ppT6G+AXnpzWWSQhPNH7wZzHfqb7hfAsvLREiw37PdqpqrKn351U5z3BUT2E0 NHy8BuOq2RonlPu+tBlNr4BW+U02LBowUvsgC56QuGhRxRxEZqQkMzaaSQSVGe5E8BxB L01Je2biHKnCk7+HLQqC31YIFagugBW752UPTJEMzamuik4th9ZuTkmgc37tgDVL8Ygq jDaA== X-Forwarded-Encrypted: i=1; AJvYcCVYeEcki4aswwOf6hiZDHKgU4T+r0u2y+Xnj5Q4aa5NFmv24tpQTD34oVec4Oau+qCK6SW5MBYK/ONy@vger.kernel.org X-Gm-Message-State: AOJu0YzRHNpLYHw3O/7eRriuRGtVv6Cm9e72lb5U7EhX6G5lU1YjawYI gNVqNpYE8UbvghIFR7vhIndqa8J8tuVTgByQvMVjd5pkt1i9B60LAiSa X-Gm-Gg: ASbGncsly9Hvg5KXCN5HYM0j/H/qYs30p3ea8l3yKRx2NCKUEcC3aQeSJW37wbisdyY rvcwsXMMkS1m5PqC5ppF/KicKvLmBNq5hBlWygfY0T/X607F4ilNvMWaSRrFL0q9y365/2RIH1K o4B3r4+Hazga755TKELb0weBL3YD5rhXk85GNcJ00RP9xnZETin+QkKwPtMGiC54KOev0XRQMZu RfXF7JwKw5EwKY++N65+knVn5E+dLVu4k845eYBGG5oogWLaLJjoahwhV8fCIyL5kqzopOBixk3 QvRddEiDr959rNhSRcNvgakUseP5feLrG6DJyrsGSbBsFadoSNDOo0yg0Un1P0b8pNGlDyjy2ju sQ3uVeFdupgEElWbsUNg= 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> Precedence: bulk X-Mailing-List: linux-ext4@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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/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