From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (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 B3D5119258E for ; Sat, 13 Sep 2025 01:16:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757726178; cv=none; b=tPingvw4heFseTc+WnDPK9199W7+MRKJInq0hA7b98PEJcxcunK+E3Wx+Xa/u0VpJybgDu8DS2tzex/iQ+rSQ4dkbxrOXC3BmgZob1dQwJOYICVfx/+6fdDNWPmgP8ZOR+GkmvlKplD/gu8UZoSb99tMPDqVWEGxKIhGpewST14= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757726178; c=relaxed/simple; bh=EiIsazq+8AAIxPXReMMvw7uV4x0thFYUO8UTXtaH2NM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WV15HIJJK7kWwhmDnnzLBFpTMPZVtTH9KkPEzCHV4eKp+HzQdJ9jAHD0tN1PTnjTDHu8vMRV7kpNWsnTfBbwYIr7WtukC9pGTRYrx2do3E741oDjSU08il10aJtMxJKEGFVUJZWPORYjfIof+BfuyLaEZpRBPWYelZeGn9KeR+0= 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=jvSr4bQV; arc=none smtp.client-ip=209.85.208.52 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="jvSr4bQV" Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-6228de280a4so4102066a12.2 for ; Fri, 12 Sep 2025 18:16:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757726172; x=1758330972; 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=IjswgxWrFNOKRwzjkiuQ0bl5mmgWmo9Cqzfehf6N75I=; b=jvSr4bQV0NBkepgypf1ITx9wJFDPd8goYHDE3v7WHi72yPVyDxhnXpAqyMnSOr/KsN 3OgNR1FpfEl7UVZvRliYvyPjFnA5aAz/oO6imykP8IPDQ7RsyvkOKBCfzkpcc37up4nN 9XeN3SQrdwycGfKTtnZKbAnvp2wgZdcKuGGCoFtklFGvAYOUQobhPy6gswMgIlW3bH/A 7W/CpoWHMNGfwNWxRdtCvLdIyBrRMG25Y0XMznqgy1VNw5ORUZb+Pgvn5Z8DqRRIFWG/ kT29/ji3yQpFmGkd/nm/AGAqO5UV4tVOrKirHilAqIvHDHcpknTzHFO8zFVlVShmeFSy VEvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757726172; x=1758330972; 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=IjswgxWrFNOKRwzjkiuQ0bl5mmgWmo9Cqzfehf6N75I=; b=ikUyXkCxV29Qn9dpNQ5Eh+vC9464rKiLJhk58r6zTUoMxOtwiRWgqjeneD8tT/LI/s 2vF24lLfuYVxP4HalyXrlVgY+cO93Nyy0yHDX+rFcAp7WECxppWEZbldMV2X5UzfVdCe rpiryiX4wEw3j3uyXl621YC4R5B25o6dAjKycxFPkK8hS1a8nz79dbUnzVzbH9sxmN8g YSNaQTMffk4a9dySYF4HHXvkLJxad3dokp0t6GRw0MIk7V6yrRg6UNHMnprnj31v++Nr 11AnM7QvHrbameCb1JhdbhUVw+SMFMV0NzBiJlwBLmruji12KoGrb1sRcGAippOSnlnu 1D5w== X-Forwarded-Encrypted: i=1; AJvYcCXW3od410W02uzBwX9gFj5Lq/3dzk7H0jCEszdUONTWwNhUhl9uTu3I2GRwxMXqvBxm1reOL0bJ8rU=@vger.kernel.org X-Gm-Message-State: AOJu0YzYgWQec2YjnYYkl+AAptk+4buTvt99NsuaXPlEJiN/xb0WD2RT 8xPjsqJrIE8Rtwj7ug2JjBJlEMXrzcm/8KWqDIDUIaR+Qov7c/UNRsG9 X-Gm-Gg: ASbGnctNLIduZL5ua0i7KzdvnixjgOOgHuRnqCoEOvx62MCGkYC4z6WIumu/ZpJu5wD CxmisVizr/rpZhi503Sylp10/c1kVwcveHP9Xr7U5yDAvKH5f+k2+SyulI2arjMLYqil7qbMhJr D33wSNmn5oZLsTkSK7DuMEqsxvNO9KtLugWhOquJrJ0vtAX0hfTUksGMAGGqJtcSPB+H98v1kFa Vh6rWKOiblBqew7AQtIgEq1TwgngwQ5vuqcXndNi7TkgA+rKUTRjN99bbgnJRsdakmB7Zkyqylc RQqe6klfjGN0kWnBzUEJvwzc6Of4IPWErS/DD1nn5EHZfryhOBZhiz39PS2LtNvWOT9GEgz3Hpf sIa8/6/X3IN1wlFUK1Fj6fUMSGsOyuA== X-Google-Smtp-Source: AGHT+IE1vl5AoL08hnxvihV4MKDaztrK6JygVC9P3kqlNeKyWBvnhpYqmVFYWjhHgbqbRt0/sx/2Sg== X-Received: by 2002:a05:6402:40d3:b0:61e:ae59:5f07 with SMTP id 4fb4d7f45d1cf-62ed82718ddmr4360854a12.20.1757726172015; Fri, 12 Sep 2025 18:16:12 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id 4fb4d7f45d1cf-62ec33ac2efsm4135647a12.12.2025.09.12.18.16.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 18:16:10 -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 33/62] init: remove init/do_mounts_initrd.c Date: Sat, 13 Sep 2025 00:38:12 +0000 Message-ID: <20250913003842.41944-34-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: initramfs@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 --- init/Makefile | 1 - init/do_mounts_initrd.c | 36 ------------------------------------ init/initramfs.c | 23 +++++++++++++++++++++++ 3 files changed, 23 insertions(+), 37 deletions(-) delete mode 100644 init/do_mounts_initrd.c diff --git a/init/Makefile b/init/Makefile index b020154b3d2a..09657c0274eb 100644 --- a/init/Makefile +++ b/init/Makefile @@ -17,7 +17,6 @@ obj-$(CONFIG_INITRAMFS_TEST) += initramfs_test.o obj-y += init_task.o mounts-y := do_mounts.o -mounts-$(CONFIG_BLK_DEV_INITRD) += do_mounts_initrd.o # # UTS_VERSION diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c deleted file mode 100644 index 509f912c0fce..000000000000 --- a/init/do_mounts_initrd.c +++ /dev/null @@ -1,36 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "do_mounts.h" - -static int __init early_initrdmem(char *p) -{ - phys_addr_t start; - unsigned long size; - char *endp; - - start = memparse(p, &endp); - if (*endp == ',') { - size = memparse(endp + 1, NULL); - - phys_external_initramfs_start = start; - phys_external_initramfs_size = size; - } - return 0; -} -early_param("initrdmem", early_initrdmem); - -static int __init early_initrd(char *p) -{ - return early_initrdmem(p); -} -early_param("initrd", early_initrd); diff --git a/init/initramfs.c b/init/initramfs.c index 90096177a867..8ed352721a79 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -606,6 +606,29 @@ int initramfs_below_start_ok; phys_addr_t phys_external_initramfs_start __initdata; unsigned long phys_external_initramfs_size __initdata; +static int __init early_initrdmem(char *p) +{ + phys_addr_t start; + unsigned long size; + char *endp; + + start = memparse(p, &endp); + if (*endp == ',') { + size = memparse(endp + 1, NULL); + + phys_external_initramfs_start = start; + phys_external_initramfs_size = size; + } + return 0; +} +early_param("initrdmem", early_initrdmem); + +static int __init early_initrd(char *p) +{ + return early_initrdmem(p); +} +early_param("initrd", early_initrd); + static BIN_ATTR(initrd, 0440, sysfs_bin_attr_simple_read, NULL, 0); void __init reserve_initrd_mem(void) -- 2.47.2