From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (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 043633AC39 for ; Sat, 13 Sep 2025 00:41:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724071; cv=none; b=jeMVKZSLfpdH9Gwd47UzJZzG+PR+RHWuACBsktazdCktw63B1v9521pxbkw6k0I2gTOpZK5dQeGCIV5D8LLJ+WzJ+h1dVzTT4Du1wLuVxk+xcfo/gtu9eHMGnn+nauDxkzpXciM3OW6YAy9WL1VdgE3eDNhM83thzUie9oWPVNY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724071; c=relaxed/simple; bh=yhXDovoFaZRmENn1P/7nJEAYKmeDJf//ZQgmQHs9gQQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WAThsU5JjqkCyQA8O1U+imD0EphaGtDbY9SKqQqfBFta7hCMMRwDhWzkrxdLtpKxNQ6BU/cqjFmsH6zFCnPhBUBGGwkwFGJV3gOV1lKtao/xEg4UO7VxdbR+xeYtPDL2LY4CmHAg+pbtbVMGtPg6pRsdTHeMkVz8URbEg98S484= 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=LeLgkTBj; arc=none smtp.client-ip=209.85.208.41 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="LeLgkTBj" Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-62f0bf564e4so144753a12.3 for ; Fri, 12 Sep 2025 17:41:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757724067; x=1758328867; 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=XF39SoyvPO4HSizOmVkN9E4c/OCzbmGR6ZiNtCSz3R4=; b=LeLgkTBjsbam/V5tjmeu8XIRmYholHa/MziO3vhNLx5+7IbFpOtKfvXI6IrpHYIUf/ w0rub1UynMtAbnqZl0+0PEKjR7sjO1hDuG9eElIdzeyC0wh6NG1DuL8tEcIgm7WZYVAE bRBWL/udapdFPjuWEKO++d8TuIQS91RBSpbwR7sXn474MD/kcz0hDjdCJXH/lQ7yNoZi KXKJ1sA8T4zBNUMHbJQ4WOYJyT6o8usyOrgUfIFqdFV+U+h5h0W8y20o30fXs6WP800r jXpUaYNhR5jQRBjTvKWUuFsdqBpRR+uQchb1e5zzEGRcMjEDpLUlPDG0wtBXsi6qN3qd +2Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757724067; x=1758328867; 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=XF39SoyvPO4HSizOmVkN9E4c/OCzbmGR6ZiNtCSz3R4=; b=u0CX/umnbw7eKgaMTZ9YiBGJAtlN6EjhANj2PLrds5FaoeshQmjWkQbvEbJ9oxlwWZ s8JhL3NGl7N/JuR7G+Q5Z3SVDJIZf29KyolcKKiQ7YJxkok/S5VnUeHUkidxWGroUCZ0 iWTqyy1bDRzJeXd8bTiWS1l5HdErFZ3z442HGS59agNy5clq4RMpBY0aIkqXhcvLPN5Q 2wD7HImLezaJA9tNnIMIRtSucFyrPRH9i1cK0UQS89Gh1JAnGf7eGuulcxbpQNPMW5bm uHcfmE/BMeRLDwysD/ConL/69e2PtcDVOsKZsuWNi33S8co5FB+MVq7eMtyHLGlzjQ3G dU6A== X-Forwarded-Encrypted: i=1; AJvYcCW5zNelZ82J1YCzEs4YY6AEfoY5DQYspQ722Wt7j21XPfp31911Cv/oKCEaH4nE7DxFIMXzsdjdI0KoSxQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwoDx6bEBTpQ4WsFE1pK+G0KWkzcJwy+xX3MVUdSsGouDRDR1wV LAQ9hJsDDkqt4m0G67I2am8NY+YyY2H5If0PkqhIqmIEwV7FfNzGecWm X-Gm-Gg: ASbGncsvhz74ZqQMC6kY6BOf65rvpVERduI5m0u17KWWG8HBVV7yg60Yd54X6t1AUwa rnj2Xe+3obW0aWe/uTCHqyijTGdbi+sr9SWCIrz+iM4nXnvw+qrr0HIUVd3xuPU/gcnqXGL1pZS AU6E8a3iOmKOxLIYHw8n2QfvhFJjTwh75y5gn+GIPmoZhzylDkikrINSFTuDzU++EozxdRz/W1B 8hs8EdLCY7ub/Tkhjw6Jx5Krm8MQ5kK4DJ1PVKIU9hyXNBhqlnjrpYROvDwIBsFLnrV6xk3LCH6 eAYrTRmRmoOZhrvX67vOrmoNtsoO7Zu8fpgM7yMv0h+S02Oyrl5Es7aL3xXktYdyjN4o+QkKMYb Rj8o7qYJhcwK+DVbHwTb44saeL4luWYjgyjsjqZG/ X-Google-Smtp-Source: AGHT+IEtE+sLJ/l9Jfm7JaiF1fYpyMVV9PhBGBMQ2H0UV0Mi6JbllI7aH7Kqq18B0Ua9aQ0IxOB0Jg== X-Received: by 2002:a05:6402:3552:b0:62e:ed2f:a660 with SMTP id 4fb4d7f45d1cf-62eed2fa993mr2339876a12.11.1757724067127; Fri, 12 Sep 2025 17:41:07 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id 4fb4d7f45d1cf-62f0c7a5546sm189920a12.43.2025.09.12.17.41.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 17:41:06 -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 01/62] init: remove deprecated "load_ramdisk" command line parameter, which does nothing Date: Sat, 13 Sep 2025 00:37:40 +0000 Message-ID: <20250913003842.41944-2-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is preparation for initrd removal Signed-off-by: Askar Safin --- Documentation/admin-guide/kernel-parameters.txt | 2 -- arch/arm/configs/neponset_defconfig | 2 +- init/do_mounts.c | 7 ------- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentatio= n/admin-guide/kernel-parameters.txt index 747a55abf494..d3b05ce249ff 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3275,8 +3275,6 @@ If there are multiple matching configurations changing the same attribute, the last one is used. =20 - load_ramdisk=3D [RAM] [Deprecated] - lockd.nlm_grace_period=3DP [NFS] Assign grace period. Format: =20 diff --git a/arch/arm/configs/neponset_defconfig b/arch/arm/configs/neponse= t_defconfig index 2227f86100ad..16f7300239da 100644 --- a/arch/arm/configs/neponset_defconfig +++ b/arch/arm/configs/neponset_defconfig @@ -9,7 +9,7 @@ CONFIG_ASSABET_NEPONSET=3Dy CONFIG_ZBOOT_ROM_TEXT=3D0x80000 CONFIG_ZBOOT_ROM_BSS=3D0xc1000000 CONFIG_ZBOOT_ROM=3Dy -CONFIG_CMDLINE=3D"console=3DttySA0,38400n8 cpufreq=3D221200 rw root=3D/dev= /mtdblock2 mtdparts=3Dsa1100:512K(boot),1M(kernel),2560K(initrd),4M(root) l= oad_ramdisk=3D1 prompt_ramdisk=3D0 mem=3D32M noinitrd initrd=3D0xc0800000,3= M" +CONFIG_CMDLINE=3D"console=3DttySA0,38400n8 cpufreq=3D221200 rw root=3D/dev= /mtdblock2 mtdparts=3Dsa1100:512K(boot),1M(kernel),2560K(initrd),4M(root) p= rompt_ramdisk=3D0 mem=3D32M noinitrd initrd=3D0xc0800000,3M" CONFIG_FPE_NWFPE=3Dy CONFIG_PM=3Dy CONFIG_MODULES=3Dy diff --git a/init/do_mounts.c b/init/do_mounts.c index 6af29da8889e..0f2f44e6250c 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -34,13 +34,6 @@ static int root_wait; =20 dev_t ROOT_DEV; =20 -static int __init load_ramdisk(char *str) -{ - pr_warn("ignoring the deprecated load_ramdisk=3D option\n"); - return 1; -} -__setup("load_ramdisk=3D", load_ramdisk); - static int __init readonly(char *str) { if (*str) --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.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 39FFB481DD for ; Sat, 13 Sep 2025 00:42:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724137; cv=none; b=lERr7D0H4GylP4udZ4wDOHcqw7lslrM9QZ8pbOTxiEKqVkv8CoPcRde7OmTynt1xy816wBtbV/B0nPB6GC04HJjCFKKf05wHI6HsSnvolOaZeOWlD6NXAMDK2bDRJcgX8Hsz92gX/y5nzjp7WEt8CbhqDyf+3y0N1eV+oxgmSmU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724137; c=relaxed/simple; bh=e1WCcnLcnFd6vSa9GXhjG8apiPFNDP8cBSBGKhm1A0M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GHtcd1hHxsA04AEn+YGk4xnq9Cq2yagnsy74MIZwQBsHrP8zNS82t+ACB4+Ca6KQMg3qYLnjVoijFU9x6eMtazCQRcnOnIW8K/QJhTXFMm5kJBrYvFhvPbMDToILCuQmPxMQMEdY4h2iEQoH2FKO2BTk+EeSDil8+V04E+OYSDw= 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=GyeGCvQG; arc=none smtp.client-ip=209.85.218.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="GyeGCvQG" Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-b0787fc3008so352866066b.3 for ; Fri, 12 Sep 2025 17:42:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757724133; x=1758328933; 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=Iq4EBZrV1lfKd4Zb7NXCMDMChiW0nY1yh2iMeYqfP7Y=; b=GyeGCvQGXPHBE41J82uu+Cjbau22HxWpjhgX2wShnOnO4nzZNPtLm1DRkl0+F/f0ca rzTX4IdzFdI9MG903XTJiOZcK5xECFwTp7RGpXsacOpGSgDlUfHyfZnyrIb0PYq/WIAN rDX+MYuGDBcb+iUGcR6M5gc4VKjsz8psWUCkGGc/btj9eHPCaKx6ZV5sPuMli9kMuw9b 06Fgv281fvFrk0DBdieOCo+ieWCGggnxq7xulicoHGHbeILgKLmHPVtkyPrDlx6PYrxZ V0TXTUp8w9m/9N3a9Fuy5mhVTEj1Rc7h9WUHnTB8yzGtVTwDvxGd9R0AnOsDNxCdz+MB Idsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757724133; x=1758328933; 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=Iq4EBZrV1lfKd4Zb7NXCMDMChiW0nY1yh2iMeYqfP7Y=; b=wEWskuJiBqv2Ogo6SQA/OtWbo6rEnRnd2Xi+QfsrpbSdMP1TtVZwFw1BhJSsq71Ukx 0KdaF2Okh55ft6IgJLo7zsX8jrTnm775SN8JAIOnKroh4XrGbmmvYMMEuXfXN0nWjin0 Dgab5sYHQTPcRFZUQ2B352wOSYhXqdcZZXwkWpUPcLN9yhd8J0UYy3ICAmKhoYXLjqvS 9M3m0+pDTic4hTzVYmOS3XfhPGJY/kBwA08sxEt3EFev3BwIOocdNKvCPRjmjUplBgw7 YbDG6iFhqo6kBj4Bnh9gSiuvYYjNX2KJDEy7RgnvZ+z+Kebg9wYKuD7KYXXaRWsRUVe1 oGZw== X-Forwarded-Encrypted: i=1; AJvYcCUZlx5ACWCbJWyoDQjQgPCxdpPhh6P3MGUR7CJrBglRxk46hz5bVQ5+JXBxPURrDpFHhOIHtoFLl91fGtQ=@vger.kernel.org X-Gm-Message-State: AOJu0Ywa7X6upO/HWT46U++PS6MZppjDtqCtvty72aBsNTMuioAhyENM 1nCQDz6ukgQ+p6AXaIrLs9XzQBS8waxTel0kuAgkY3vuOxyaQS02Wpgt X-Gm-Gg: ASbGncsZ/PI4KcaVVzvO0NAjOwtI3zZFhjRi9eRfE5xs4u+hpcIjJgUPPTfnICmV0vv PDlbtYnwHhi9tec93GcK++H4VXsspeeqLbcbJl1FkpRM/ieD9MJbn1Ep6dtU/7A8/6pA/mUJlxd MMleRbqwn9HzKNTTMAxmI6+At0qqNMMtjIyjEUazQDhTQDYlY0aEMiQAQLHDqj2e3XSI7CV7vEP PiZxnIHrCeDfRuSwuQk8MDS34gGVRbue7KsHLgt7KXNbg4U4P0grrHUAmmDw8GSb9UYTymfV+S+ 9FM6DDerZIXV+ICMy1i3T4zTXQNvl+8Qf9rDHFg0VLTHczSnAJuMcNRq1pw95aJYJHxq1BWiytp vTnnlnAuy8ZVTnwguPpU= X-Google-Smtp-Source: AGHT+IF0YGOwgI/SiDLzLobCRbGCMEuk6UiMOqwXQtTxtsbaeH+eIG/iAAo9vQw+zhuCea49+yp7bA== X-Received: by 2002:a17:907:2d2b:b0:afe:8761:e77a with SMTP id a640c23a62f3a-b07c35833dfmr474345066b.19.1757724132448; Fri, 12 Sep 2025 17:42:12 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b3128a5csm466901366b.37.2025.09.12.17.42.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 17:42:12 -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 02/62] init: remove deprecated "prompt_ramdisk" command line parameter, which does nothing Date: Sat, 13 Sep 2025 00:37:41 +0000 Message-ID: <20250913003842.41944-3-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is preparation for initrd removal Signed-off-by: Askar Safin --- Documentation/admin-guide/kernel-parameters.txt | 2 -- arch/arm/configs/neponset_defconfig | 2 +- init/do_mounts_rd.c | 7 ------- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentatio= n/admin-guide/kernel-parameters.txt index d3b05ce249ff..f940c1184912 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -5229,8 +5229,6 @@ Param: - step/bucket size as a power of 2 for statistical time based profiling. =20 - prompt_ramdisk=3D [RAM] [Deprecated] - prot_virt=3D [S390] enable hosting protected virtual machines isolated from the hypervisor (if hardware supports that). If enabled, the default kernel base address diff --git a/arch/arm/configs/neponset_defconfig b/arch/arm/configs/neponse= t_defconfig index 16f7300239da..4d720001c12e 100644 --- a/arch/arm/configs/neponset_defconfig +++ b/arch/arm/configs/neponset_defconfig @@ -9,7 +9,7 @@ CONFIG_ASSABET_NEPONSET=3Dy CONFIG_ZBOOT_ROM_TEXT=3D0x80000 CONFIG_ZBOOT_ROM_BSS=3D0xc1000000 CONFIG_ZBOOT_ROM=3Dy -CONFIG_CMDLINE=3D"console=3DttySA0,38400n8 cpufreq=3D221200 rw root=3D/dev= /mtdblock2 mtdparts=3Dsa1100:512K(boot),1M(kernel),2560K(initrd),4M(root) p= rompt_ramdisk=3D0 mem=3D32M noinitrd initrd=3D0xc0800000,3M" +CONFIG_CMDLINE=3D"console=3DttySA0,38400n8 cpufreq=3D221200 rw root=3D/dev= /mtdblock2 mtdparts=3Dsa1100:512K(boot),1M(kernel),2560K(initrd),4M(root) m= em=3D32M noinitrd initrd=3D0xc0800000,3M" CONFIG_FPE_NWFPE=3Dy CONFIG_PM=3Dy CONFIG_MODULES=3Dy diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c index ac021ae6e6fa..f7d53bc21e41 100644 --- a/init/do_mounts_rd.c +++ b/init/do_mounts_rd.c @@ -17,13 +17,6 @@ static struct file *in_file, *out_file; static loff_t in_pos, out_pos; =20 -static int __init prompt_ramdisk(char *str) -{ - pr_warn("ignoring the deprecated prompt_ramdisk=3D option\n"); - return 1; -} -__setup("prompt_ramdisk=3D", prompt_ramdisk); - int __initdata rd_image_start; /* starting block # of image */ =20 static int __init ramdisk_start_setup(char *str) --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (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 5FED238FB9 for ; Sat, 13 Sep 2025 00:43:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724202; cv=none; b=TP85NK7ChlEzkWCFKmahtuumYn/71BXfaA2kWqhm54nbZuaH4z6qX2OBtBXHiWUs5ZHFIX1UUUVcBGoOT8G91HL80wiOx+L+WAo+/1yN+TCW1X7E4GjgIGzB9kSsKuXFlNuuVvvfwMeC8jbFkbhNW7jv4vGs9NySrXbm/0nkL0o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724202; c=relaxed/simple; bh=YJ3HeYdgmHPacx2K6CLagA34dvdD+umyj49eLYi815Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tK3Nm1NFkc9WyZ/lT43+eLdJIMZqPqpyiwRYyuYgVy9AmbmZeGYsVPFwB9vtG7r7DiLdm0l0fdFb+HHOMHCbIGO7UDlonn+gaWiBMDxqSq/2ycq22z5RezlNzoKZFxhoe9pQ07qs7IVCcRqXVDLS5I0yPNosHymvDlXH6ufNgms= 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=jFBjZhx/; arc=none smtp.client-ip=209.85.218.41 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="jFBjZhx/" Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-b043a33b060so373933966b.1 for ; Fri, 12 Sep 2025 17:43:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757724198; x=1758328998; 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=nBhZ+rO7As9Va0yYpTLBkeUqDA8zrexqjuJeztCSNI4=; b=jFBjZhx/Mc9YVQOowWWYRFZmW/gI8a7r2Jr7SHSX+maCx9+kJC7Qxhfp6pVAm8Iowi KktUKT6pEE6IrXOGZlm/Yaw5a6keuuTBDhRkZONxXS05e5kMOtxdlzGkeGikDZTIWb+Z 5SdddamSLJmM/11Vhxf9uXl3CHcGNKLi6Vlq07NCu3g8ASYDtsys25quNZ5+Pl1b3dXJ IzgnpUAGb0+7bnrZB28miB0YrVmo9xqN/IDgazo83AaQoSLtOeYmEcg7HDENos1Kyvnc Co7HdjBY408nU4q5Ktur0aUYt1jibkq9wK/WOwoSuQF+fUMGM0JxQWxSfQjaIqhNNkcN 2big== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757724198; x=1758328998; 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=nBhZ+rO7As9Va0yYpTLBkeUqDA8zrexqjuJeztCSNI4=; b=OhmWRi6rNXPiNvDVNnfhrVb8krH1EYrlWuu6/V8kJmCqnwEXPEG4nmELALv3rIM/AN P7HVYGmoqE+69uMhWyItZtWCC/iUiPT4SJcHgf1EsRWduUAmcBHNI88mkGO7mF7kaQrZ L03MM3vFk1BhgueAvMSb72O+/RYasNPKmkzXnjp3ehBl6k0jxs6U1qpaXtIKDNGR6pcE 6EjyisVXaPO4Vmni0n16ozaR9Etorfa2QWM/UnDSOC0tjrIz8ZUGbQoY2ac5XQMhf4YU Ch4K56Tswq4AtsZvmk1oA6QLYfa8QeZXXK+JCYMQMo01zQgFZNaT4XDp9ebbrHeWYPgy hXbA== X-Forwarded-Encrypted: i=1; AJvYcCXdGkBxqOMLmrg3qRdj0dyVmSlFGaXmC/IvYbSSU1JTfiZwdunyTM/7JR+xvKudTf7+2AEpIDiWuSCVB2A=@vger.kernel.org X-Gm-Message-State: AOJu0YzcR+d0FLIpx/P//aNBad+L852Vikg+RwkuYU5JjdimQupFuHpr d2rfvqWBHUgDYXM3++DdJAza9pe0d9wAzv4HmPYuZCDEisqP+ZOS5pYA X-Gm-Gg: ASbGncs7Cb1LNSGpkhw5xG7Sxkg5k1pGA1zSZhV8GNcRNVNWhvXY7qHNsyS5Ha9fOeB hVe+cFDGyMnWzo0e9YRyzi+qhITbKSAEMCAGPqtR5CNTbPQKLnlzeZbbB6Ph9Ucsv/G2YTx1b/O FFtNq7ZE4hP5su9iHFpI8e+j7CWfgKOJhgrUBcgVrdJJ5UNYPZPFpBS4Mk9oSCgi+8csjNr6vpc 11lptwbsZedS4szgfODIGMKr+IImPMyir9+SFa7mi3nHA+7NdOVWiZ11zj/WBszLEgRBFH1vqh9 CDwWUScoOEP/IJhvJywCYUz4HLkmgv4Ph6YdJWjGqPAlLhHS/PduVFP1nkkW6cH08lIoAb6/SCY mZ9ru+l5+vfCa0XhErFA= X-Google-Smtp-Source: AGHT+IHHzjbduKroQCN+yZXT2xkuDjXRSEwS3nHiIMvASVJIn5ZPiks4NchkJZtKdw5/XwXcHwo3Pw== X-Received: by 2002:a17:907:9405:b0:b07:c9b2:dbd with SMTP id a640c23a62f3a-b07c9b20f2cmr456569266b.4.1757724197720; Fri, 12 Sep 2025 17:43:17 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07cd14268fsm196477866b.3.2025.09.12.17.43.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 17:43:17 -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, stable+noautosel@kernel.org Subject: [PATCH RESEND 03/62] init: sh, sparc, x86: remove unused constants RAMDISK_PROMPT_FLAG and RAMDISK_LOAD_FLAG Date: Sat, 13 Sep 2025 00:37:42 +0000 Message-ID: <20250913003842.41944-4-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" They were used for initrd before c8376994c86. c8376994c86c made them unused and forgot to remove them Fixes: c8376994c86c ("initrd: remove support for multiple floppies") Cc: # because changes uapi headers Signed-off-by: Askar Safin Reviewed-by: Christophe Leroy --- arch/sh/kernel/setup.c | 2 -- arch/sparc/kernel/setup_32.c | 2 -- arch/sparc/kernel/setup_64.c | 2 -- arch/x86/include/uapi/asm/bootparam.h | 2 -- arch/x86/kernel/setup.c | 2 -- 5 files changed, 10 deletions(-) diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 039a51291002..d66f098e9e9f 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -71,8 +71,6 @@ EXPORT_SYMBOL(sh_mv); extern int root_mountflags; =20 #define RAMDISK_IMAGE_START_MASK 0x07FF -#define RAMDISK_PROMPT_FLAG 0x8000 -#define RAMDISK_LOAD_FLAG 0x4000 =20 static char __initdata command_line[COMMAND_LINE_SIZE] =3D { 0, }; =20 diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c index 704375c061e7..eb60be31127f 100644 --- a/arch/sparc/kernel/setup_32.c +++ b/arch/sparc/kernel/setup_32.c @@ -172,8 +172,6 @@ extern unsigned short root_flags; extern unsigned short root_dev; extern unsigned short ram_flags; #define RAMDISK_IMAGE_START_MASK 0x07FF -#define RAMDISK_PROMPT_FLAG 0x8000 -#define RAMDISK_LOAD_FLAG 0x4000 =20 extern int root_mountflags; =20 diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c index 63615f5c99b4..f728f1b00aca 100644 --- a/arch/sparc/kernel/setup_64.c +++ b/arch/sparc/kernel/setup_64.c @@ -145,8 +145,6 @@ extern unsigned short root_flags; extern unsigned short root_dev; extern unsigned short ram_flags; #define RAMDISK_IMAGE_START_MASK 0x07FF -#define RAMDISK_PROMPT_FLAG 0x8000 -#define RAMDISK_LOAD_FLAG 0x4000 =20 extern int root_mountflags; =20 diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/= asm/bootparam.h index dafbf581c515..f53dd3f319ba 100644 --- a/arch/x86/include/uapi/asm/bootparam.h +++ b/arch/x86/include/uapi/asm/bootparam.h @@ -6,8 +6,6 @@ =20 /* ram_size flags */ #define RAMDISK_IMAGE_START_MASK 0x07FF -#define RAMDISK_PROMPT_FLAG 0x8000 -#define RAMDISK_LOAD_FLAG 0x4000 =20 /* loadflags */ #define LOADED_HIGH (1<<0) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 1b2edd07a3e1..6409e766fb17 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -223,8 +223,6 @@ extern int root_mountflags; unsigned long saved_video_mode; =20 #define RAMDISK_IMAGE_START_MASK 0x07FF -#define RAMDISK_PROMPT_FLAG 0x8000 -#define RAMDISK_LOAD_FLAG 0x4000 =20 static char __initdata command_line[COMMAND_LINE_SIZE]; #ifdef CONFIG_CMDLINE_BOOL --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.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 2075A6BB5B for ; Sat, 13 Sep 2025 00:44:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724270; cv=none; b=VIeBrHRzI0z3qruaVzvBeWCRrHg937ey7riQu5GxOnx4xXKosD4dySuhEDV24ykJ5J60vsRtTMWRLYEeUqp2OWquP7qAq7XJd3uUtaWIuPAt71dOXIz05w3rNPIb29Win487b7lkbyHhGFmIQbXx4nXHAspFNitWr0NzNQ0UKuY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724270; c=relaxed/simple; bh=+LWWZ93WeHG1ZURXNoQkloqtRmkGuFP+V1Io9d7yWPg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uJ8UN7FczfJcfVQUvh1WAKTQCc8q3HduL295+2eoA+mwK9A0+X1HywF+/MOX/GrLKWl9WYZIRP1gVjdNUAcXcjWlowKwSKhJsIFhZZpuHDX5DPrNnHSUv4nN6gM/3g3NtZ2VKnAetZlLRDPJKXTgelozWt0CIunKUO/Zun1d1M0= 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=BROC7HJU; arc=none smtp.client-ip=209.85.218.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="BROC7HJU" Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-b046fc9f359so374133066b.0 for ; Fri, 12 Sep 2025 17:44:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757724263; x=1758329063; 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=mS1RU3iN10evrK469i2WiyUlx0z0fCCFudj+RlZ74kg=; b=BROC7HJUzctyQkbAj9kgHVE5KZrkCBEZMYo7DUnhCkWfou/mKxock+qVtn4ETR6pui cpvNeTJKmg9hOTgVHZXv/QEFVhiCHeQ7y6nhSxiUw9yXkbmp0W1aIZckm70LpJ7vAOEp tGiGnsja62czFbH//wzId7GVp8zJJmWfqwHuBVC/nGxZIpp5XBr70YCd4jYNu0iB5vJt ZqktHUUVDDwAJlgTtkfNPejGN09xuRTNy6TMzF7k0E+jcclk6jVtucX+e/z7f6oDmG3B RipywTitn6/2DoQfefvnMI3eKHi1qHyCpWSNQXo9diBCxUK7bm7E5VGTJ56PSkfObqvj PkgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757724263; x=1758329063; 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=mS1RU3iN10evrK469i2WiyUlx0z0fCCFudj+RlZ74kg=; b=MC0DxdEl3poy1zwJcwH8mtWs7Th6Yxu3osd+2YqO/ZxQozirl4oBK5BtckHcNyje2P 4yRc8hSGUW2PfLLu9FTnuqBEz3nGn2GS4Mzv6CxVdBoE+nIaE8aIg2bhWZBkx2AJt+nN UhINVerXdMkdjmAUxIMEIGtWq1v9dmg3sbDcxmBgaTGnrN3AubiG8HKe4tHx1PoQmeEf v0DIR2aCyVMzjnuhK35aWLENJtOwjJAKwY0YpsQXJI3ZBNviaZcVYeE7qIMHY9halv81 9vsrZJLIYquux13+OjK23HOySPafvXM8XSyizGb/+hmEAuXL5HbsM3bjtptFsPL0zBL8 qVIA== X-Forwarded-Encrypted: i=1; AJvYcCXauNVI74Xx3XH1s+4xvWTO7yjlUNc4aBHdQMEl1EXPg/69Jaia9+IWiVRHthoivtk9xfTa+yW2HCKASio=@vger.kernel.org X-Gm-Message-State: AOJu0YxGdxgipOJzoIqbaB3hYghd0abTOaCJ9kGlcjEwIL54NEEqdbcs 9w3lMiop0804xDqmcD0676l/PLFc32/rqkwNRcwZebF/TaLqEaJJbSnCwF9/yXUt X-Gm-Gg: ASbGncvlf1UGxXvUD9hKWD4ER7QN3i+5mSjFaM9mBMmspGH/qLFrbVNvI7LnQPwT1Wh Zfk/tdDSiBFpXzX30BDnCns3A2YdmCRYgOuR7lgNrWbKAuQdOfYjCrKUitQ+CyAff81/BfOTMEp TxYdJAGrrzeIVuVLltCJEVP5FwLbSNTBTI+gUD29hg6OKN17ruzfo/MAFugzdwv8e8gBUhOMhMU bqJZZar0/A5fZh+vXihs4mkh/TROPYsBS9XeQtHGa2cKZ1o8pb4ssHxOy6m3PXU550YQ7LQJFI2 VKhjEQ8SCEMpzLbHymUDE8EIbQJa7bj3F0i3soeUh7Ie4j9ZwkqO7YsxpORE/tFpljeVSixCb25 CiwfkTcMZGPrNxZrdOubrJnU/OfkY6+HbSw1l65QE X-Google-Smtp-Source: AGHT+IGv+W1CKcLOi4yIcUzFHvekB6fCSOQ02Af5wm0+L59XCtUVRow/cynXcFSqj0NNtuL4eJLrqA== X-Received: by 2002:a17:906:f587:b0:b04:5a74:b66f with SMTP id a640c23a62f3a-b07c354e930mr489676666b.3.1757724263304; Fri, 12 Sep 2025 17:44:23 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b30da327sm475829066b.11.2025.09.12.17.44.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 17:44:22 -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 04/62] init: x86, arm, sh, sparc: remove variable rd_image_start, which controls starting block number of initrd Date: Sat, 13 Sep 2025 00:37:43 +0000 Message-ID: <20250913003842.41944-5-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is preparation for initrd removal Signed-off-by: Askar Safin --- Documentation/arch/x86/boot.rst | 4 ++-- arch/arm/kernel/atags_parse.c | 2 -- arch/sh/include/asm/setup.h | 1 - arch/sh/kernel/head_32.S | 2 +- arch/sh/kernel/setup.c | 9 +-------- arch/sparc/boot/piggyback.c | 4 ++-- arch/sparc/kernel/head_32.S | 4 ++-- arch/sparc/kernel/head_64.S | 6 ++++-- arch/sparc/kernel/setup_32.c | 5 ----- arch/sparc/kernel/setup_64.c | 5 ----- arch/x86/boot/header.S | 2 +- arch/x86/include/uapi/asm/bootparam.h | 5 +---- arch/x86/kernel/setup.c | 5 ----- include/linux/initrd.h | 3 --- init/do_mounts_rd.c | 8 +++----- 15 files changed, 17 insertions(+), 48 deletions(-) diff --git a/Documentation/arch/x86/boot.rst b/Documentation/arch/x86/boot.= rst index 77e6163288db..118aa7b69667 100644 --- a/Documentation/arch/x86/boot.rst +++ b/Documentation/arch/x86/boot.rst @@ -189,7 +189,7 @@ Offset/Size Proto Name Meaning 01F1/1 ALL(1) setup_sects The size of the setup in sectors 01F2/2 ALL root_flags If set, the root is mounted readonly 01F4/4 2.04+(2) syssize The size of the 32-bit code in 16-byte paras -01F8/2 ALL ram_size DO NOT USE - for bootsect.S use only +01F8/2 ALL ram_size DO NOT USE - for bootsect.S use only - used to cont= rol initrd, which was removed from Linux in 2025 01FA/2 ALL vid_mode Video mode control 01FC/2 ALL root_dev Default root device number 01FE/2 ALL boot_flag 0xAA55 magic number @@ -308,7 +308,7 @@ Offset/size: 0x1f8/2 Protocol: ALL =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D =20 - This field is obsolete. + This field is obsolete. Used to control initrd, which was removed from L= inux in 2025. =20 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D Field name: vid_mode diff --git a/arch/arm/kernel/atags_parse.c b/arch/arm/kernel/atags_parse.c index 4ec591bde3df..a3f0a4f84e04 100644 --- a/arch/arm/kernel/atags_parse.c +++ b/arch/arm/kernel/atags_parse.c @@ -90,8 +90,6 @@ __tagtable(ATAG_VIDEOTEXT, parse_tag_videotext); #ifdef CONFIG_BLK_DEV_RAM static int __init parse_tag_ramdisk(const struct tag *tag) { - rd_image_start =3D tag->u.ramdisk.start; - if (tag->u.ramdisk.size) rd_size =3D tag->u.ramdisk.size; =20 diff --git a/arch/sh/include/asm/setup.h b/arch/sh/include/asm/setup.h index 84bb23a771f3..d1b97c5726e4 100644 --- a/arch/sh/include/asm/setup.h +++ b/arch/sh/include/asm/setup.h @@ -10,7 +10,6 @@ #define PARAM ((unsigned char *)empty_zero_page) =20 #define MOUNT_ROOT_RDONLY (*(unsigned long *) (PARAM+0x000)) -#define RAMDISK_FLAGS (*(unsigned long *) (PARAM+0x004)) #define ORIG_ROOT_DEV (*(unsigned long *) (PARAM+0x008)) #define LOADER_TYPE (*(unsigned long *) (PARAM+0x00c)) #define INITRD_START (*(unsigned long *) (PARAM+0x010)) diff --git a/arch/sh/kernel/head_32.S b/arch/sh/kernel/head_32.S index b603b7968b38..4382c0f058c8 100644 --- a/arch/sh/kernel/head_32.S +++ b/arch/sh/kernel/head_32.S @@ -28,7 +28,7 @@ .section .empty_zero_page, "aw" ENTRY(empty_zero_page) .long 1 /* MOUNT_ROOT_RDONLY */ - .long 0 /* RAMDISK_FLAGS */ + .long 0 /* RAMDISK_FLAGS - used to control initrd, which was removed fro= m Linux in 2025 */ .long 0x0200 /* ORIG_ROOT_DEV */ .long 1 /* LOADER_TYPE */ .long 0x00000000 /* INITRD_START */ diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index d66f098e9e9f..50f1d39fe34f 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -70,8 +70,6 @@ EXPORT_SYMBOL(sh_mv); =20 extern int root_mountflags; =20 -#define RAMDISK_IMAGE_START_MASK 0x07FF - static char __initdata command_line[COMMAND_LINE_SIZE] =3D { 0, }; =20 static struct resource code_resource =3D { @@ -273,19 +271,14 @@ void __init setup_arch(char **cmdline_p) =20 printk(KERN_NOTICE "Boot params:\n" "... MOUNT_ROOT_RDONLY - %08lx\n" - "... RAMDISK_FLAGS - %08lx\n" "... ORIG_ROOT_DEV - %08lx\n" "... LOADER_TYPE - %08lx\n" "... INITRD_START - %08lx\n" "... INITRD_SIZE - %08lx\n", - MOUNT_ROOT_RDONLY, RAMDISK_FLAGS, + MOUNT_ROOT_RDONLY, ORIG_ROOT_DEV, LOADER_TYPE, INITRD_START, INITRD_SIZE); =20 -#ifdef CONFIG_BLK_DEV_RAM - rd_image_start =3D RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK; -#endif - if (!MOUNT_ROOT_RDONLY) root_mountflags &=3D ~MS_RDONLY; setup_initial_init_mm(_text, _etext, _edata, _end); diff --git a/arch/sparc/boot/piggyback.c b/arch/sparc/boot/piggyback.c index 6d74064add0a..a9cc55254ff8 100644 --- a/arch/sparc/boot/piggyback.c +++ b/arch/sparc/boot/piggyback.c @@ -220,8 +220,8 @@ int main(int argc,char **argv) =20 /* * root_flags =3D 0 - * root_dev =3D 1 (RAMDISK_MAJOR) - * ram_flags =3D 0 + * root_dev =3D 1 (1 used to mean RAMDISK_MAJOR, i. e. initrd, which was = removed from Linux) + * ram_flags =3D 0 (used to control initrd, which was removed from Linux = in 2025) * sparc_ramdisk_image =3D "PAGE aligned address after _end") * sparc_ramdisk_size =3D size of image */ diff --git a/arch/sparc/kernel/head_32.S b/arch/sparc/kernel/head_32.S index 38345460d542..46f0e39b9037 100644 --- a/arch/sparc/kernel/head_32.S +++ b/arch/sparc/kernel/head_32.S @@ -65,7 +65,7 @@ empty_zero_page: .skip PAGE_SIZE EXPORT_SYMBOL(empty_zero_page) =20 .global root_flags - .global ram_flags + .global ram_flags /* used to control initrd, which was removed from Linux= in 2025 */ .global root_dev .global sparc_ramdisk_image .global sparc_ramdisk_size @@ -81,7 +81,7 @@ root_flags: .half 1 root_dev: .half 0 -ram_flags: +ram_flags: /* used to control initrd, which was removed from Linux in 2025= */ .half 0 sparc_ramdisk_image: .word 0 diff --git a/arch/sparc/kernel/head_64.S b/arch/sparc/kernel/head_64.S index cf0549134234..4480c0532fe9 100644 --- a/arch/sparc/kernel/head_64.S +++ b/arch/sparc/kernel/head_64.S @@ -52,7 +52,9 @@ stext: * Fields should be kept upward compatible and whenever any change is made, * HdrS version should be incremented. */ - .global root_flags, ram_flags, root_dev + .global root_flags + .global ram_flags /* used to control initrd, which was removed fro= m Linux in 2025 */ + .global root_dev .global sparc_ramdisk_image, sparc_ramdisk_size .global sparc_ramdisk_image64 =20 @@ -71,7 +73,7 @@ root_flags: .half 1 root_dev: .half 0 -ram_flags: +ram_flags: /* used to control initrd, which was removed from Linux in 2025= */ .half 0 sparc_ramdisk_image: .word 0 diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c index eb60be31127f..fb46fb3acf54 100644 --- a/arch/sparc/kernel/setup_32.c +++ b/arch/sparc/kernel/setup_32.c @@ -170,8 +170,6 @@ static void __init boot_flags_init(char *commands) =20 extern unsigned short root_flags; extern unsigned short root_dev; -extern unsigned short ram_flags; -#define RAMDISK_IMAGE_START_MASK 0x07FF =20 extern int root_mountflags; =20 @@ -335,9 +333,6 @@ void __init setup_arch(char **cmdline_p) if (!root_flags) root_mountflags &=3D ~MS_RDONLY; ROOT_DEV =3D old_decode_dev(root_dev); -#ifdef CONFIG_BLK_DEV_RAM - rd_image_start =3D ram_flags & RAMDISK_IMAGE_START_MASK; -#endif =20 prom_setsync(prom_sync_me); =20 diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c index f728f1b00aca..79b56613c6d8 100644 --- a/arch/sparc/kernel/setup_64.c +++ b/arch/sparc/kernel/setup_64.c @@ -143,8 +143,6 @@ static void __init boot_flags_init(char *commands) =20 extern unsigned short root_flags; extern unsigned short root_dev; -extern unsigned short ram_flags; -#define RAMDISK_IMAGE_START_MASK 0x07FF =20 extern int root_mountflags; =20 @@ -640,9 +638,6 @@ void __init setup_arch(char **cmdline_p) if (!root_flags) root_mountflags &=3D ~MS_RDONLY; ROOT_DEV =3D old_decode_dev(root_dev); -#ifdef CONFIG_BLK_DEV_RAM - rd_image_start =3D ram_flags & RAMDISK_IMAGE_START_MASK; -#endif =20 #ifdef CONFIG_IP_PNP if (!ic_set_manually) { diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S index 9bea5a1e2c52..0ced2e9f100e 100644 --- a/arch/x86/boot/header.S +++ b/arch/x86/boot/header.S @@ -235,7 +235,7 @@ hdr: .byte setup_sects - 1 root_flags: .word ROOT_RDONLY syssize: .long ZO__edata / 16 -ram_size: .word 0 /* Obsolete */ +ram_size: .word 0 /* Used to control initrd, which was removed from Linu= x in 2025 */ vid_mode: .word SVGA_MODE root_dev: .word 0 /* Default to major/minor 0/0 */ boot_flag: .word 0xAA55 diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/= asm/bootparam.h index f53dd3f319ba..bf56549f79bb 100644 --- a/arch/x86/include/uapi/asm/bootparam.h +++ b/arch/x86/include/uapi/asm/bootparam.h @@ -4,9 +4,6 @@ =20 #include =20 -/* ram_size flags */ -#define RAMDISK_IMAGE_START_MASK 0x07FF - /* loadflags */ #define LOADED_HIGH (1<<0) #define KASLR_FLAG (1<<1) @@ -37,7 +34,7 @@ struct setup_header { __u8 setup_sects; __u16 root_flags; __u32 syssize; - __u16 ram_size; + __u16 ram_size; /* used to control initrd, which was removed from Linux i= n 2025 */ __u16 vid_mode; __u16 root_dev; __u16 boot_flag; diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 6409e766fb17..797c3c9fc75e 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -222,8 +222,6 @@ extern int root_mountflags; =20 unsigned long saved_video_mode; =20 -#define RAMDISK_IMAGE_START_MASK 0x07FF - static char __initdata command_line[COMMAND_LINE_SIZE]; #ifdef CONFIG_CMDLINE_BOOL char builtin_cmdline[COMMAND_LINE_SIZE] =3D CONFIG_CMDLINE; @@ -541,9 +539,6 @@ static void __init parse_boot_params(void) bootloader_version =3D bootloader_type & 0xf; bootloader_version |=3D boot_params.hdr.ext_loader_ver << 4; =20 -#ifdef CONFIG_BLK_DEV_RAM - rd_image_start =3D boot_params.hdr.ram_size & RAMDISK_IMAGE_START_MASK; -#endif #ifdef CONFIG_EFI if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature, EFI32_LOADER_SIGNATURE, 4)) { diff --git a/include/linux/initrd.h b/include/linux/initrd.h index f1a1f4c92ded..6320a9cb6686 100644 --- a/include/linux/initrd.h +++ b/include/linux/initrd.h @@ -5,9 +5,6 @@ =20 #define INITRD_MINOR 250 /* shouldn't collide with /dev/ram* too soon ... = */ =20 -/* starting block # of image */ -extern int rd_image_start; - /* size of a single RAM disk */ extern unsigned long rd_size; =20 diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c index f7d53bc21e41..8e0a774a9c6f 100644 --- a/init/do_mounts_rd.c +++ b/init/do_mounts_rd.c @@ -17,11 +17,9 @@ static struct file *in_file, *out_file; static loff_t in_pos, out_pos; =20 -int __initdata rd_image_start; /* starting block # of image */ - static int __init ramdisk_start_setup(char *str) { - rd_image_start =3D simple_strtol(str,NULL,0); + /* will be removed in next commit */ return 1; } __setup("ramdisk_start=3D", ramdisk_start_setup); @@ -60,7 +58,7 @@ identify_ramdisk_image(struct file *file, loff_t pos, unsigned char *buf; const char *compress_name; unsigned long n; - int start_block =3D rd_image_start; + int start_block =3D 0; =20 buf =3D kmalloc(size, GFP_KERNEL); if (!buf) @@ -196,7 +194,7 @@ int __init rd_load_image(char *from) if (IS_ERR(in_file)) goto noclose_input; =20 - in_pos =3D rd_image_start * BLOCK_SIZE; + in_pos =3D 0; nblocks =3D identify_ramdisk_image(in_file, in_pos, &decompressor); if (nblocks < 0) goto done; --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (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 8AC366BB5B for ; Sat, 13 Sep 2025 00:45:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724333; cv=none; b=KM8c8g9PL74huHckTH0NPHd65HnAEtz7o/447yhWQJUX6LzO5NirOaVXNbzf7HfJArV4Gy0RM0OTUGm7OTGX9vb3SbUHyhy7AUFR5sBpRqrdLBoYyYOxYnEyMSf8/eHRPVl5esCuXRnzDhnYWGyb9t/XiVzPcQ3LQdvWHoOTozs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724333; c=relaxed/simple; bh=kibOCauDCBkqzoIIQtVCNE2P0zxtFVdI1DUZ/kvaArs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FFlniozk9hvx7EO/qKke2prWKH1T7TPR5166xdXhatLQTZ8UOKVj3P6DkNGDr6cTR6y/kT8crBQFg0UktJDvtQzewSbJT+QjYrLDyVypjvUvkkGUnatEp5kXWQBRoV9Tgahlmm/NaAROwGN/Gr7dmQtlKQFwAu328hwj+3NyInI= 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=HOStwEqH; arc=none smtp.client-ip=209.85.218.53 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="HOStwEqH" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-b043a33b060so374069366b.1 for ; Fri, 12 Sep 2025 17:45:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757724329; x=1758329129; 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=fi1FJKwP9nWnSjptSGh11GRsqwR1G48l7l6Ou3g4XAs=; b=HOStwEqHw8VoYhk7VlxxKOyJSgS3oHdg9X+fH9tPx8w3h+SQEBbgO6RjhW40LGfh7U 7bxuSSZ2f0QLvSJJrCAbrfcXm6EhsCN+XJ1lIzoOPCQOiLb7LqDSXQQYP85D5gX0T6+P 5jaIBw0hoLHPtpGJ3pWXXPg3JAdrjiLpKOHlOvGYo45xN0DLGaejUxVIxRQI3oZIpRud hvko6/1Vpn1tmc/uXidMtUD0wPWKYEVLP0V5MxpbQDXGGQJF2b6NB0mbAzuvb8tbGKZa R+mcO//zHtUaf0W7Fc3IPPmoFcBAZCBNm7+Oa1SPvpA5yHNZZM9b7qS1xXWTaim6mZiS 9M2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757724329; x=1758329129; 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=fi1FJKwP9nWnSjptSGh11GRsqwR1G48l7l6Ou3g4XAs=; b=CgUaxPavlN1Un85Aer79ePVJoRUttBABF7cqi3r7yhxkG0D77EntFAD/n1cJ0Y+Dpj JNl0aXVriSimAInOoK1jRWwEI+HZx/O5gMAXv3pPqSe1VvC0yot6PNWVEw63eshbCxTM EyvZScAbPFqGK8j1C05EMAYLoEFatph/gC/srMaApf/oam/z5VHAPMMaE1U1OM99ngvD 9W7p1A6Cr9oY7IEC5UYWwaM8aXwL+E++uXwt2ns4NvcEBYmF39yo16oHIrw5mEzfIH2o ZtvsYThyv5JLVCQe1zlrYE27nY9uJ9doX4UwHUea6WwAtfP6aWDgRvDuL4FqKUJMrXUL 9E/Q== X-Forwarded-Encrypted: i=1; AJvYcCXarkV9D6xa50rXEay2tKAHO2MLXQCD1Cw2Sw/+nm9xehIwn97F2/kmA552NZyBmj0o3KIUid4e/dHsvEw=@vger.kernel.org X-Gm-Message-State: AOJu0YxpaBczKRleBI7IKiJxUUMImLBcE0aQE48mW0vLC/H0BkVv+8NC 89Fz9nH2zWPmiMfw/SliZnfQVwPbaDNuJ3ySfdmJKr6XUzYGqkUy58r6 X-Gm-Gg: ASbGnct7za3cYlwWOYjTJU7IAvhYTo61/cKEUlWC+Pc5LqfZ9Zo+G37BdoHVjWWqqL4 hDi5//b5WG2kPoVtcnRj3gun04HD13hV4PiLibiruF4QzTA+3y1a3qwVkYKQWLcjp5//gMHKirg J/LaK/BkcFXHCQsVflZK71f/z3eDnO7TNrY5iruWY4A17Kt7HuzQuJitXPzYhZl674tqeKsSlrr sqKkHhGx+JcBwqoPezVILy+gp5b+3SoSH1CJ45RcebmEIWVtlyQSeRWO8qmgJpilBvSBsYNU6IJ uCFjnxwSriZWa9adbBWZmL+dn/29FOOOEx2UubJTe7gve/eTIfsZnP/5Tq78CoXuh3aq9hk0EcP rkJHDYZ3F5LHnOoGW5sU= X-Google-Smtp-Source: AGHT+IEY39yKNpHOwhu+b8E85JfZO5GXoHp0A73FES6zZeZtQwPXvLC0BV0HcFzY55ZLXxqy2VO9oA== X-Received: by 2002:a17:907:9405:b0:b07:c9b2:dbd with SMTP id a640c23a62f3a-b07c9b20f2cmr456963866b.4.1757724328684; Fri, 12 Sep 2025 17:45:28 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b32dd5casm460965366b.68.2025.09.12.17.45.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 17:45:28 -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 05/62] init: remove "ramdisk_start" command line parameter, which controls starting block number of initrd Date: Sat, 13 Sep 2025 00:37:44 +0000 Message-ID: <20250913003842.41944-6-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is preparation for initrd removal Signed-off-by: Askar Safin --- Documentation/admin-guide/blockdev/ramdisk.rst | 3 +-- Documentation/admin-guide/kernel-parameters.txt | 2 -- init/do_mounts_rd.c | 7 ------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Documentation/admin-guide/blockdev/ramdisk.rst b/Documentation= /admin-guide/blockdev/ramdisk.rst index 9ce6101e8dd9..e57c61108dbc 100644 --- a/Documentation/admin-guide/blockdev/ramdisk.rst +++ b/Documentation/admin-guide/blockdev/ramdisk.rst @@ -74,12 +74,11 @@ arch/x86/boot/Makefile. =20 Some of the kernel command line boot options that may apply here are:: =20 - ramdisk_start=3DN ramdisk_size=3DM =20 If you make a boot disk that has LILO, then for the above, you would use:: =20 - append =3D "ramdisk_start=3DN ramdisk_size=3DM" + append =3D "ramdisk_size=3DM" =20 4) An Example of Creating a Compressed RAM Disk ----------------------------------------------- diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentatio= n/admin-guide/kernel-parameters.txt index f940c1184912..07e8878f1e13 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -5285,8 +5285,6 @@ ramdisk_size=3D [RAM] Sizes of RAM disks in kilobytes See Documentation/admin-guide/blockdev/ramdisk.rst. =20 - ramdisk_start=3D [RAM] RAM disk image start address - random.trust_cpu=3Doff [KNL,EARLY] Disable trusting the use of the CPU's random number generator (if available) to diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c index 8e0a774a9c6f..864fa88d9f89 100644 --- a/init/do_mounts_rd.c +++ b/init/do_mounts_rd.c @@ -17,13 +17,6 @@ static struct file *in_file, *out_file; static loff_t in_pos, out_pos; =20 -static int __init ramdisk_start_setup(char *str) -{ - /* will be removed in next commit */ - return 1; -} -__setup("ramdisk_start=3D", ramdisk_start_setup); - static int __init crd_load(decompress_fn deco); =20 /* --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) (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 A7CDC5464D for ; Sat, 13 Sep 2025 00:46:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724398; cv=none; b=N0VVcayUZ0gf6/Tau+qIYnomGho+wJKSLB3ndWg0IYKJS0frru9zAa/uDhP8qNLfcCjxB7DbnmXAIFF9eLT3B+vw96CnXwjJ0Buq8YHSl9ubtXBPTEHbNq9jp+SzgDiMAfB7zkjlYu1wfMNNPJ0yoppKPcxq7UPCsv7lJE94rVo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724398; c=relaxed/simple; bh=zjnx3/NY9AOu8ee75jqsChu3O0QCH1Ezxe1gYYeY9CY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FdKCWVm/jAXOyKewjf/tKUn2jjgftobaZk0IOPmZpK0FK007ZnWYcjgoNdx927HNhLNCv4tJk4BaBx1q67Qn5fad75fk+mYFsd8WNpSL+ax/QIhQK5aa4etqCKClpoDAid1hLSxjT7hs0CJQkoTy+hYX+nmZWsjZw0e6O7vGglQ= 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=PGk3bVsR; arc=none smtp.client-ip=209.85.208.45 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="PGk3bVsR" Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-61d3d622a2bso5239419a12.0 for ; Fri, 12 Sep 2025 17:46:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757724394; x=1758329194; 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=Y83Wia04Z/mNTHCUGozzAt26nJVQ29vmo/6z8Jb/IIM=; b=PGk3bVsRmWQpgLwAnVuCRO0kfYqwetnBUpZ9Zl3Pvel66XWmCXB4VKQL5Bdc7K3yzn M/NiRXfXYINjUibah+GvZKkATvgQcgRMrf1NawlM6FGu0AMPYtqvTfiI1b3aVJjsZ1zG 5YdT6fe78qL81b9ih8iEIF4U5t2vDQEqoXcLlaw+dOojNkrgJ0XGZoO11wokr1P3l8k1 2POWKMHVAj+usqOdMHfl8x1l168nDqH0UlymBKEpDjbdysCodQukbPtnikPIMlUgCONA EeCKIjtBRwOssS5KWaLD6MYW6PEx814n+0axgQBjjZ9AyZVboPwbEM/rFfBdkNQ+CZsf jz+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757724394; x=1758329194; 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=Y83Wia04Z/mNTHCUGozzAt26nJVQ29vmo/6z8Jb/IIM=; b=IrLzdFTW5e25b5+Z+8ivnf59igDJMMYOeMD2i1tnWYDP6SeWUWWIppRite1wQHdiEa wRUy+y3FghQlrji6hqbsnwnC9Xg4r7C0iDH+d0sWhJJm0OZi/wCxQvm10w5b7xLbhQk+ Y1rJ92FaVInkI15B1gcVmIUkIFTLjd1QVHb8ShYmNzc8Veuj/tnQOL/wBDxZMU6waJLo P7Uaqcbb5qP0nJMydiCfyMVnwPyqGbnCz15lKS7tqdI0RlFxzG7XwEQagiZcX2IE+Z79 SF0HglyXvM7apxwZZbHcvZ5NTQmSJ8GUc6+UVe9lcAG9rcjBR0vjcTfq5Sz/yBfFYk6L djzQ== X-Forwarded-Encrypted: i=1; AJvYcCV7nT4Cn6LGubOrD/Vlg1lwB34URwhh6h5QxMLam4rqK+jI6twt6qylGicms1ShGPckqbJ1EkK4rlzdc10=@vger.kernel.org X-Gm-Message-State: AOJu0YynDosmxOkFKSs4ik6Qll9DCQSjv9oYmjana3JP2kC3uq5dxr8j AruPkO2cJO9owkjBdcQmNriA02w0i9tDh4ybUzRmREWKAqprilCb48q47bmOj4gO X-Gm-Gg: ASbGncsh6jSBD08spt+JuWm6Pvr1ucmCNaLu0W0pbMY5vQVqWw/pxWeVuuj7Ea6YJb2 i8v6qWRuLkgnMjamrZwdtu/ZOXnwI5XvM/BUtjthtU0JPUWBuLlFBPPdqEXLwfQAU0hhymIIjlN ej8nyIkxW54RUa8dEvXzWYkuMJct0GoorCar8dv1elLwAbqpcfOymTBicl+heC7anh27v79Nehs kn8smaNb9EMqJM76/bIAlU96Tr7hYx71QSSD5b9cKdX2HF9nixBkxGKwmmPMsI0b9AroTKkTNnC SOMdscsu83o72DHpsRWgldSbx2El5955uy/aI1EajeuOAogn0/KiBlQzcfZyEYv6naEpgEo6f83 eWw6fPs+JNrnkMbije4M= X-Google-Smtp-Source: AGHT+IEhRE4IwIn6e21II3sG+AWhFOewnNElGtSUdTtt48+B8a0G24fjikoaCpJ97iRLzEKC56BiAg== X-Received: by 2002:a17:907:96a3:b0:b07:e258:4629 with SMTP id a640c23a62f3a-b07e2584a05mr103605766b.16.1757724393999; Fri, 12 Sep 2025 17:46:33 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b32f2334sm475232966b.78.2025.09.12.17.46.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 17:46:33 -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 06/62] arm: init: remove special logic for setting brd.rd_size Date: Sat, 13 Sep 2025 00:37:45 +0000 Message-ID: <20250913003842.41944-7-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" There is no any reason for having special mechanism for setting ramdisk size. Also this allows us to change rd_size variable to static Signed-off-by: Askar Safin --- arch/arm/kernel/atags_parse.c | 12 ------------ drivers/block/brd.c | 8 ++++---- include/linux/initrd.h | 3 --- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/arch/arm/kernel/atags_parse.c b/arch/arm/kernel/atags_parse.c index a3f0a4f84e04..615d9e83c9b5 100644 --- a/arch/arm/kernel/atags_parse.c +++ b/arch/arm/kernel/atags_parse.c @@ -87,18 +87,6 @@ static int __init parse_tag_videotext(const struct tag *= tag) __tagtable(ATAG_VIDEOTEXT, parse_tag_videotext); #endif =20 -#ifdef CONFIG_BLK_DEV_RAM -static int __init parse_tag_ramdisk(const struct tag *tag) -{ - if (tag->u.ramdisk.size) - rd_size =3D tag->u.ramdisk.size; - - return 0; -} - -__tagtable(ATAG_RAMDISK, parse_tag_ramdisk); -#endif - static int __init parse_tag_serialnr(const struct tag *tag) { system_serial_low =3D tag->u.serialnr.low; diff --git a/drivers/block/brd.c b/drivers/block/brd.c index 0c2eabe14af3..72f02d2b8a99 100644 --- a/drivers/block/brd.c +++ b/drivers/block/brd.c @@ -27,6 +27,10 @@ =20 #include =20 +static unsigned long rd_size =3D CONFIG_BLK_DEV_RAM_SIZE; +module_param(rd_size, ulong, 0444); +MODULE_PARM_DESC(rd_size, "Size of each RAM disk in kbytes."); + /* * Each block ramdisk device has a xarray brd_pages of pages that stores * the pages containing the block device's contents. @@ -209,10 +213,6 @@ static int rd_nr =3D CONFIG_BLK_DEV_RAM_COUNT; module_param(rd_nr, int, 0444); MODULE_PARM_DESC(rd_nr, "Maximum number of brd devices"); =20 -unsigned long rd_size =3D CONFIG_BLK_DEV_RAM_SIZE; -module_param(rd_size, ulong, 0444); -MODULE_PARM_DESC(rd_size, "Size of each RAM disk in kbytes."); - static int max_part =3D 1; module_param(max_part, int, 0444); MODULE_PARM_DESC(max_part, "Num Minors to reserve between devices"); diff --git a/include/linux/initrd.h b/include/linux/initrd.h index 6320a9cb6686..b42235c21444 100644 --- a/include/linux/initrd.h +++ b/include/linux/initrd.h @@ -5,9 +5,6 @@ =20 #define INITRD_MINOR 250 /* shouldn't collide with /dev/ram* too soon ... = */ =20 -/* size of a single RAM disk */ -extern unsigned long rd_size; - /* 1 if it is not an error if initrd_start < memory_start */ extern int initrd_below_start_ok; =20 --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (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 0A77978F43 for ; Sat, 13 Sep 2025 00:47:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724465; cv=none; b=CwCQve0ZgshVhuveyJBZEafgu88+5pvdaC5nb2JkAptD478k/d5Y0FYLz1s4uDZcvA48eJXzfp4slBInOgKZE3hCekybfvvM66jB8Qop+FSY9MBkO4Oj0N9WGsH/E6BHMfu+8zUvgkUlgChTYg4UOrWuWkhfyyCJyeRMPUF5iZk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724465; c=relaxed/simple; bh=VrIhE6DR0UxTy1zLmeYzHJtIzcnVxbHuxWIBZzITpiQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g0EHMdS3IXDxn5If2YdZsmFcsDEBJ8R9sCXhRQLDnZYhQ0sJUKlpvaDuXfI74a7bCGzABcdF6Swqv92cg3zqNE+PHVFFZooPWBtwJZbNsr0fFz3LfeHMLsyCPFC425S7/8SsVAKuBMowK68UIcpLoOmTHDNvBlRAiGkD3VD/R3g= 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=bVPk7ubm; arc=none smtp.client-ip=209.85.208.41 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="bVPk7ubm" Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-62ecd3c21d3so3049005a12.0 for ; Fri, 12 Sep 2025 17:47:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757724460; x=1758329260; 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=4fVjgLbGK8Q3VzkUirE6fakA1teoXIVC6opbXGA1ZT4=; b=bVPk7ubmvfbJylEezcnWrtaB+2U427THokEb4roL4IyrWiTXYMXexmWpsPKPXfQbMw nKwSxgx6H5iLTv3ymLQTMVtt/xXmLk7r1BVsdTvDdR2qpdG9PPYDI9oVSnDAE4E6KaYe bqRwuAkC7Hg0sOK+ynLWtI3s0Lr+a06FuHPKpNpGqQNMdmyQFj0argPtCCp5VKWfb6iO Dgen5Hd3FA4Jo1gvq8L+LssMQjQeF4c8ClGVyZbGuUw3oGCdE7GDszJEiUgLE7U2jjs3 /UN0Gn5S8u9Hcoes/4UyoLEtdl4NMM3Irfz4XqWjPTyBWzP1ihuf7mRn5Q/vCFwYr89o 0yig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757724460; x=1758329260; 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=4fVjgLbGK8Q3VzkUirE6fakA1teoXIVC6opbXGA1ZT4=; b=P/H/4aYETTltvRDr7ZeoFx2Ikvi3Uf459yFteTogsxVL0mde+9oogqFeXkbxzF1XDp M3Ethw35TFYL9wvjd9GSN7r7+8E7LAphK0AuytmmMZEBuEgkDx2JeNSM1tFWneLqnCpc y+y5sOLNCQbE0mCq4Cv2ZwIJJurMbEtbVqJpGbPki9KvAhO4iD6CvG/8eoO1Z0voH40w AD56Mg3PB5NKQQZFdevY4ugochAKMWkQJVD1yfqXbztRjsqkjqig6WyX7i/x+qMW+CVd LiFFyXWX/Fn0eQAB0P8IuYyR2YDwkVjyQwlSGAdEgjXv1v3Q/Y6hkccukZPw9vOOCg3y 5OFA== X-Forwarded-Encrypted: i=1; AJvYcCUU7yxgUIf97camHEArTGyzjC1MtMCmu+UssN9Gd26/4WLuzHkBkxdEjJHuwbOEv799IlwlABHRAyWwWw8=@vger.kernel.org X-Gm-Message-State: AOJu0YwK/KJ0IzWefv1DqzX9Fun4vgBjI/l5MSZreqrDI37aS4dZHUCW F98CZNItcb/yTMpCd+0HWcOjoZbJJT6RGIaJrMnAeqt9rska5f6yGgoB X-Gm-Gg: ASbGncuw65GZXQQOPY+UENhcpMmARQ4W3mtwwl5v1SAJdRkdUKKpQl1e8pJla3CvYNT oY7c2C1jphMX3zm/qvT4H8QVeXrWO1QarQLc4Z233gzc7cgleBsHZqb/DSBgqMxos3keFydms2M f+5ZZjS/zkZtf1L8YVA9lZihl76+MhjNYbTep8xYALN1iUwW8Xy68QHpg9kliDr0sGj5k7lD/Pk hNNIHC6M6NKU0qtLZgbfo+sEVxM5h58pCybQ/MK7a0KVTYXBkeIydh4YS9hfJLAO0Z85NRw29Rp jmHgoyW0tME6CuAs2m5CTxlYTjMlp9MlJvb5GjlWBn73/PpKqeAWwBmGqrcDYynNJZOZGL/vIxM 0MeKU7WKIvb1Bk7nxXy4= X-Google-Smtp-Source: AGHT+IEn7MCXvWnM/H721JcTSYIJ22gozO3aCU54l5QL6th5VdkTEU9iyn+bkfXPUmCFMabMmsyKeA== X-Received: by 2002:a05:6402:40c9:b0:62e:ed71:601a with SMTP id 4fb4d7f45d1cf-62eed71640amr2549162a12.36.1757724460211; Fri, 12 Sep 2025 17:47:40 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id 4fb4d7f45d1cf-62ec33f3c01sm4224385a12.34.2025.09.12.17.47.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 17:47:39 -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 07/62] arm: init: remove ATAG_RAMDISK Date: Sat, 13 Sep 2025 00:37:46 +0000 Message-ID: <20250913003842.41944-8-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Previous commit removed last reference to ATAG_RAMDISK, so let's remove it Signed-off-by: Askar Safin --- arch/arm/Kconfig | 2 +- arch/arm/include/uapi/asm/setup.h | 10 ---------- arch/arm/kernel/atags_compat.c | 8 -------- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b1f3df39ed40..afc161d76c5f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1479,7 +1479,7 @@ config ARM_ATAG_DTB_COMPAT depends on ARM_APPENDED_DTB help Some old bootloaders can't be updated to a DTB capable one, yet - they provide ATAGs with memory configuration, the ramdisk address, + they provide ATAGs with memory configuration, the kernel cmdline string, etc. Such information is dynamically provided by the bootloader and can't always be stored in a static DTB. To allow a device tree enabled kernel to be used with such diff --git a/arch/arm/include/uapi/asm/setup.h b/arch/arm/include/uapi/asm/= setup.h index 8e50e034fec7..3a70890ce80f 100644 --- a/arch/arm/include/uapi/asm/setup.h +++ b/arch/arm/include/uapi/asm/setup.h @@ -59,15 +59,6 @@ struct tag_videotext { __u16 video_points; }; =20 -/* describes how the ramdisk will be used in kernel */ -#define ATAG_RAMDISK 0x54410004 - -struct tag_ramdisk { - __u32 flags; /* bit 0 =3D load, bit 1 =3D prompt */ - __u32 size; /* decompressed ramdisk size in _kilo_ bytes */ - __u32 start; /* starting block of floppy-based RAM disk image */ -}; - /* describes where the compressed ramdisk image lives (virtual address) */ /* * this one accidentally used virtual addresses - as such, @@ -150,7 +141,6 @@ struct tag { struct tag_core core; struct tag_mem32 mem; struct tag_videotext videotext; - struct tag_ramdisk ramdisk; struct tag_initrd initrd; struct tag_serialnr serialnr; struct tag_revision revision; diff --git a/arch/arm/kernel/atags_compat.c b/arch/arm/kernel/atags_compat.c index 10da11c212cc..b9747061fa97 100644 --- a/arch/arm/kernel/atags_compat.c +++ b/arch/arm/kernel/atags_compat.c @@ -122,14 +122,6 @@ static void __init build_tag_list(struct param_struct = *params, void *taglist) tag->u.core.pagesize =3D params->u1.s.page_size; tag->u.core.rootdev =3D params->u1.s.rootdev; =20 - tag =3D tag_next(tag); - tag->hdr.tag =3D ATAG_RAMDISK; - tag->hdr.size =3D tag_size(tag_ramdisk); - tag->u.ramdisk.flags =3D (params->u1.s.flags & FLAG_RDLOAD ? 1 : 0) | - (params->u1.s.flags & FLAG_RDPROMPT ? 2 : 0); - tag->u.ramdisk.size =3D params->u1.s.ramdisk_size; - tag->u.ramdisk.start =3D params->u1.s.rd_start; - tag =3D tag_next(tag); tag->hdr.tag =3D ATAG_INITRD; tag->hdr.size =3D tag_size(tag_initrd); --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (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 5975913A3ED for ; Sat, 13 Sep 2025 00:48:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724530; cv=none; b=qqnc1FlGNVdsPBelD68gxLJPKuu9nnL041+LgLeLRdZCqKaOoqbRajMlvmcs/iYiVn3zTLCn4IO5ZuoxJSeVhHNZnfMU1YexKg0+Jc739EVJLKGe6kBx7vWQ4Rv9P8udd18YTXL9b7n5X81bR8pk/Yl6K4KXbebs3QjCAf6oS34= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724530; c=relaxed/simple; bh=xKqULWXz/2FiENcJWmfzamYmMIE4imk3W/BtNdWBiQw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VFDrDzYlwdth+zdiPTMnWzOsCH/DWwgDyBOJSfBiUaypAkvUgvP+mVFnLdfV+olHEKQ5SyEZL65F3hfTukyuYTur5Mm/o96pIOF3nNQSvTxSr7nN8ldU0pz2qQWv4+eEKKABnTe1OHZfWkR6Ut0X/Djz7KWEJXldM0hV1xNxFAk= 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=LXC5LHaV; arc=none smtp.client-ip=209.85.218.44 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="LXC5LHaV" Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-b0415e03e25so324087466b.0 for ; Fri, 12 Sep 2025 17:48:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757724526; x=1758329326; 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=AaXPZ8GS+1OiGE0ZCje70+VbQ3y123W+k6t1ILETLlQ=; b=LXC5LHaVko3hLgitulh2D+X+9QzDfKDNhew7kFXwh3JBpMXe8S8TiFwp92HLY5PnX/ nE0PBrgrSYYmvUr7nB60XBcUGWbD3ENdwZDdGEZEpmftZ+HtA+EeeF7PR1uT2dDM52dc ZMVq+Hm8pSzt/CvRPR7Me2trqTMPiaCvHkP6+b+IEQvD5eF5k0u5n4FsZ31R41RDQcDQ BrBCpUlXV52huKpy2TgomHW9QVs9Ykrr2tU/v4K4dgAQoo0ONvDQb+XsjiZSFbJ2IgvS xrCTwIgGWYosdnf/NGyWsk7DdhjDkNLnA/ofhmUV8ldCxH2yGyu11Sj/DxoAM0vBqfC8 jM3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757724526; x=1758329326; 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=AaXPZ8GS+1OiGE0ZCje70+VbQ3y123W+k6t1ILETLlQ=; b=MOWGh+ldOcw9arP576Km/WND2HQyNP2FbPXh7BiCON9X7bF8SAehXk3Fxcd02iPsaK I2dvmNDT2PdI7wCoeKR5owKq1barWia0wCQejVknEZfB2+J31wEZQ1e6Nw1VPCuIkdEY SdY/BL4zdVfU2Y15ptxMUtHHfZxyJOblZ8ITTMZtEyCME5CEVK4ifzxpeNkTvXIBX1WF iKjqZkKlxWzi+w1y752QVUh66jjmyNjU+zgdPkNcBMT7uGxnilHwAbDDAqf8IuybkF+K NYT+is5PR8UYUuqXKDG04Gy6OXkjeDCaZ4azqOf+OvIJipXl5FDqvSRGu/a9noL/RgGA 0jsw== X-Forwarded-Encrypted: i=1; AJvYcCWUZ1gEB0kZZbc3SFJ0UTt0rfgb4JM/KQMExpLrYWn5kN2XSXWVMuowa3/W4mE7Qj8MjovvS6IHLuMlVu8=@vger.kernel.org X-Gm-Message-State: AOJu0YxmHbfUcW/irBv+JTznnPASyFcp6QEzVYCAaC4GnLy1XH7+eohY oOBKqxnyLJzXilqaEVJLO2+dtmLmB3xqnWyHZ10LEDn+iCQPKYo6Upo5 X-Gm-Gg: ASbGncsVWOpx1Xxw0e4qgQUoGLRD4eoD6Dx1u5QeSmWs6Zx30Ge+J5P2v5QhrNGMD0d hZ/8gYFB7l92OHnGjbvIO0kkqYubepzWvHR28snZpuf3VcLPtmgHccWDQNZ+X7at/zh5q8OnmC3 AR9lNviilsKCGEDEkubU5NQlHq0rN0SraOqpQk0+pH6Ij5MLAfO9zdX7+9R6Q4ATXd7HYFGWR8B dDepcMkB9m7kVXZEmMiOjIX9CSjOw9g7GLBvA+jinujgbiW5QAYdt+31J7Lk6CM9a5zMG/3uirp ueEl1BpjXFBHd1M7RMuK6mbT5q1sptAw5rdJqLw42hN7Zo4E+s0lmyN2rNAbW3TzxFMtgLXEyqK QMc3lO7MwAA5AXaG78mA= X-Google-Smtp-Source: AGHT+IG9OWg6vz1Y30fO80tUWulNMPWiUpAt7xVByuYcp52he6rblxs++6dTXTQkGfdvR2czpiOABA== X-Received: by 2002:a17:907:d88:b0:af9:add3:6bbb with SMTP id a640c23a62f3a-b07c35fb469mr433586666b.29.1757724525627; Fri, 12 Sep 2025 17:48:45 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b32dd5bfsm461777466b.63.2025.09.12.17.48.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 17:48:45 -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 08/62] arm: init: remove FLAG_RDLOAD and FLAG_RDPROMPT Date: Sat, 13 Sep 2025 00:37:47 +0000 Message-ID: <20250913003842.41944-9-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" They are unused since previous commit Signed-off-by: Askar Safin --- Documentation/arch/arm/setup.rst | 4 ++-- arch/arm/kernel/atags_compat.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Documentation/arch/arm/setup.rst b/Documentation/arch/arm/setu= p.rst index 8e12ef3fb9a7..be77d4b2aac1 100644 --- a/Documentation/arch/arm/setup.rst +++ b/Documentation/arch/arm/setup.rst @@ -35,8 +35,8 @@ below: =3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D bit 0 1 =3D mount root read only bit 1 unused - bit 2 0 =3D load ramdisk - bit 3 0 =3D prompt for ramdisk + bit 2 unused + bit 3 unused =3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D =20 rootdev diff --git a/arch/arm/kernel/atags_compat.c b/arch/arm/kernel/atags_compat.c index b9747061fa97..8d04edee3066 100644 --- a/arch/arm/kernel/atags_compat.c +++ b/arch/arm/kernel/atags_compat.c @@ -44,8 +44,6 @@ struct param_struct { unsigned long ramdisk_size; /* 8 */ unsigned long flags; /* 12 */ #define FLAG_READONLY 1 -#define FLAG_RDLOAD 4 -#define FLAG_RDPROMPT 8 unsigned long rootdev; /* 16 */ unsigned long video_num_cols; /* 20 */ unsigned long video_num_rows; /* 24 */ --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (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 5CEDE7DA6D for ; Sat, 13 Sep 2025 00:49:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724597; cv=none; b=Pf80tDzEBfoFNgyTmUXf5iNfWBuoABGyB4GTBIJXpnlIMKwOWL3OXvResqJEnOn5RUq4kO0nFOlSkyM0cnz2x2H2veOIR+AWRoAkJMZgKN4cIBL3tEISITq9xSBh2CTHJ1t1YEGHHyMktQJ2u+ww22gEpRUPjYjmI0sVFNd0JWw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724597; c=relaxed/simple; bh=aIH0UEBp9jrH7zT+VD2BpCtGu5L0ukANS11y+zY/wiQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U4yU2/M3qHioc50t9tIE2GCx2mf0cqhAjnszbkfTnPpOE05slyWVfsnZ8LzgXDU+8FwYnpq/zpNPgXLkP4nliIwdKhPjPrkkNpVE5gi4jpQZqGJaxz+JzSh0mhzRC7L9KL9OXCVGgoQLq8PrGhvVoD095m3BT4tHDOX+SenG7fY= 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=bnalPX+q; arc=none smtp.client-ip=209.85.208.44 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="bnalPX+q" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-62ed68313b6so2380838a12.3 for ; Fri, 12 Sep 2025 17:49:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757724592; x=1758329392; 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=k6cH8q1TrVQNxjzjuQXybOp7uw+/s7mQTk4MQOvceKM=; b=bnalPX+qyvgr51ymiDlUfPxoeZUYWgEFDy0cQeYqymsBCvCezOGrJ3U8Al89pGPiSi SSyRFcIuh3aPN7d3nbj3vFvet/FtixGvtToqVpvbhZnl71bJcjH55pysGpeFLsxcJClr Bt/m6pOWSQS3nswISqsPVyKXarq9cHQAiqrIJRpMDOcq4sXGJxOcdj37SQNsEzQrAS07 ojQ1n2EnI2YZzsJI23mG6otl+nP4GjF3XGApnMXBOQzVVuhDymKpXPgfAkD7IJvdXDnj ysQ8Cd7j3XqEpnxg98FXaz0YvfYwLiaeShFJBYv68hPUadpXC9ulul209mPf00t/7nOW Yx9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757724592; x=1758329392; 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=k6cH8q1TrVQNxjzjuQXybOp7uw+/s7mQTk4MQOvceKM=; b=MgMUGe1+5iQngiDAfNXxIV6Mu7f0i5/pMsUK32W+hZa8OTVL7IC3MUE0ULXhPJt7Gn 6F+1GJar/QFMVW5GAwLjdz88zitnTcVj0PKvTWRru5W69TY9f+LEceJnK6DXA2chHBOT +rXY8h+9Gf/YIDLyGmdvmo3rCFeEl2PX2B94cuU8sh+9n2XxCiQt7eln5oKHlLsujuCM Sr1JgeijI8enykI6eD7o+B36EO/WAkjDZh2ZbYtSrDZUZzbgYtUg2P9o1PURMpD8oa2I 2sYMZis9PPekHu9ijeW+4ljE3uBxXf79Pn4NEL+a01axP5GdNk64TVxUSx9c95ly1PtG Z8ng== X-Forwarded-Encrypted: i=1; AJvYcCUVXwMS7KShVsBsnMct6H07RQwfhboURXaNUzTIw3rdrZeD9ea5BH619/fO8QSagtYp5vUpNRBVC6ne/t8=@vger.kernel.org X-Gm-Message-State: AOJu0YzoV3PzfLbJPbC6PXKbgptZ3/Q0g7ipNT0nxUv7Fcc/puYW+mS7 OJzUxNcMC+eC+QencjDA5aOZ8JPjyXHMMI58IFdMkYcUw146rbKrFZcr X-Gm-Gg: ASbGncs6ZB8/5Npez8f/YZrjVgdNj9gRuvBI2z9VxpOf+47WNFfiNXu9RvQ3+te1nd7 JnrQcbTD0mMDbbrXaXm7sUFNvHSHGv9CDW4wlFtAISVYQjR9qqaMj9Zjr8vEBXosynHJJn9bcym SUGqQ61uy3r8fQi0VM/+Z7zq7nd6gghr9ycnLuX8UycJA5Xxd+rxJjXl/0ew+rQ537K3iOFELDg aRnxUl23p/vLHXGAF7JpNDL1/KDZnj5qipKdlk7eiy45qoO8USg5ZT7lXweuuaJOKn2Tqxw/M6f 8VC/3ghvH82GtU1JLNU1j9wi63dNwjisn7z3o7HVa9EQEibgg76uAHqq1TihZ2B9p/n9UJymhrt 7L0W2VkVU/G2dO/+Ge58zvM/e+BW8ag== X-Google-Smtp-Source: AGHT+IFuaD6uE53o0kMUFqkBYFUIpIv4YZNYfnndGaXs7B0K4+B96SRU2dTVgEWhisS3xuLKgCtRtQ== X-Received: by 2002:a05:6402:4316:b0:62e:df3b:79a6 with SMTP id 4fb4d7f45d1cf-62edf3b81cemr3814693a12.1.1757724591635; Fri, 12 Sep 2025 17:49:51 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id 4fb4d7f45d1cf-62ec33f3b6csm4149162a12.32.2025.09.12.17.49.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 17:49:51 -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 09/62] arm: init: document rd_start (in param_struct) as obsolete Date: Sat, 13 Sep 2025 00:37:48 +0000 Message-ID: <20250913003842.41944-10-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It is unused now Signed-off-by: Askar Safin --- Documentation/arch/arm/setup.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/arch/arm/setup.rst b/Documentation/arch/arm/setu= p.rst index be77d4b2aac1..01257f30d489 100644 --- a/Documentation/arch/arm/setup.rst +++ b/Documentation/arch/arm/setup.rst @@ -86,7 +86,7 @@ below: initial ramdisk. =20 rd_start - Start address in sectors of the ramdisk image on a floppy disk. + This is now obsolete, and should not be used. =20 system_rev system revision number. --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (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 2886E6BB5B for ; Sat, 13 Sep 2025 00:50:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724667; cv=none; b=fDNoRULkxoJRGSHeAmMJ8AwOm53a2437yXdr3vFDn/Zpl8+b0Tk++AoG76ZAt121KhN7ngI32mAbIN4eLlH9XQ/OECLTVmo7snQ32xauySnR8hHZx4Cb57ds9NBSR1Jx3Ukrkfda4gFpQe26ss3GQieIzteUYQGx+K2LwInm+fw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724667; c=relaxed/simple; bh=tV4nt9hoLByV/HIUuc0gUBUSBu2CmEr56XA56LPl3Uc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cM/9GsHedFle6AcmU57KzgS26QBmKA+xRB/U15+F1qbOQo6+KOEBsDpT6j/V3Tpy12GTcltdnFWzGviBtQyJrloUkYVC/gvsQtGSVW83z48reIEU6xKA+k6ohiu1V4bi7IbKg/uKF3GlcgtT8xAYi6A8W8mfIw4chiTNnYSnD8w= 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=nc9cMIxo; arc=none smtp.client-ip=209.85.208.41 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="nc9cMIxo" Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-628f29d68ecso4905199a12.3 for ; Fri, 12 Sep 2025 17:50:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757724657; x=1758329457; 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=SN8Fbr3lsgOHKoe91M3D1QrN7Q3MG8ghhn6m4CViO8A=; b=nc9cMIxodtr024PS9gpC7tpeZlBso06vdVJ25wO2Rir+LHqPidCLq+YosKaG2TsLZ1 /AGAytQr4+p0bZLkGuiSHv+wDI6sk5jMqOYC4a9ZcgnNLdJ/MIOMEUKT50eKb2EWvQ/Z CbOOxKKyDa/MpVfVsIh+bO1T9oyuAv/vUwlTtKt+pDHmX0r0JWeFZ1lKmddO3Yi8QHaT xzEtyist1h/ojXkIBuKxIBRA9McBgX9nSz51PyRswu76l4sW59IoVJUt+VOPeANGQExk bSejXdH99hx8AaZ7ToMGdb+tom3W1O+1GoIWzd1WGritLotCYM0NNK1IncpB/2DJ+btC cvvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757724657; x=1758329457; 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=SN8Fbr3lsgOHKoe91M3D1QrN7Q3MG8ghhn6m4CViO8A=; b=wy0Oe27lBey5f6eEw/4fhRWDNwfvNzA5eW/Fu4UdqH+7Z8q1ReTBUQ9I6i1MHKyA43 YvHPeZ4Wdeu/j37uU0W1+DgpcTvadFzONP3i6niGpFRYtiq8Kzn+EZ0D3UI66cixQhhL 3r7WXL51K84eAsuP3tLB6jONHy8aDrMLtwWqb4dXvDg9olaMQ3AOMOBUqZdknIaftw1s 7v/Qu/SV4zrNDDuymoLYLvaI3Pm74k/F7yCfOV5Q+G7FiDl8xncGf828gjESo2BZ2vU4 7Z7894sDY9LvRxYWNMiqHK2emwkQgmH3aA1IKIqkYaOczaE3G9xEAzUs7HBwxAhqxzHj ouTA== X-Forwarded-Encrypted: i=1; AJvYcCV9WMX++hBvzTdO6QlDv/rqEYADHwLaTVcm85jg6WV9EwBpB+6emIN9Uz0U8l6n2NVdZPEejSNIoVqOdTI=@vger.kernel.org X-Gm-Message-State: AOJu0YyifwTS8kxdC1yFnpGCEEZuPsbEipEtMv2ncRrnDr2v5kdVF+n5 p5gG+6aJWNXZmp3Rjw2LMj3vTTKdf7VrimGcW1fvYmv7RYuBRBhlGqsvmefaUJdq X-Gm-Gg: ASbGncuqna41jrxCO3UpDiG4UTDdDcYQyQflvuW9MwttZxLOzEGC+M3fAnY35IRvfph UknOva1Hpo8ZLh/WZIbGffK1G8ePk9N9SdDF7pFJF9ooZUlJKFODbiarni+yf9yTv3XjRarkyMk BHPbz3NqkTLC0aW+f5DXp2+BZxe/2X5IVhtI+KJ+1kwz53YrsFdWUUYDlD6FA8tX0QhSW1UARay fQXwo20xCPTNLjKKiuwnyr557Uz8hw0pAIluMO2jNHQxhAdlJl/rKdCJHpyRu+rzgIBYxeXOYQP xdMOrLbffN9INYHOW5DzQnE2rHwSL/gY2aXhT637ZkMq6bDSYYqT3m/T7ahPsLd/koAK8hcpgG1 fFaFSKyx0o3DIkZRyaDUSeHjn0MN2cw== X-Google-Smtp-Source: AGHT+IGwBv9kpJ07X8t0d529bui6CA1o44YQPv7ZkxxgSRyUsVjcwLK5rfqrILP1RhklHdaMqIUraQ== X-Received: by 2002:a17:907:7e9a:b0:afe:ea93:ddbb with SMTP id a640c23a62f3a-b07c38673ccmr474649366b.45.1757724657092; Fri, 12 Sep 2025 17:50:57 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07c2d043desm299210066b.40.2025.09.12.17.50.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 17:50:56 -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 10/62] initrd: remove initrd (initial RAM disk) support Date: Sat, 13 Sep 2025 00:37:49 +0000 Message-ID: <20250913003842.41944-11-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Initrd was deprecated in 2020. Initramfs and (non-initial) RAM disks still work. Both built-in and bootloader-supplied initramfs still work. Also remove Documentation/admin-guide/initrd.rst . It contains paragraph about initramfs, but initramfs already covered in Documentation/filesystems/ramfs-rootfs-initramfs.rst Signed-off-by: Askar Safin --- Documentation/admin-guide/devices.txt | 6 - Documentation/admin-guide/index.rst | 1 - Documentation/admin-guide/initrd.rst | 383 ------------------ Documentation/admin-guide/nfs/nfsroot.rst | 4 +- Documentation/power/swsusp-dmcrypt.rst | 2 +- fs/init.c | 14 - include/linux/init_syscalls.h | 1 - include/linux/initrd.h | 2 - init/Kconfig | 2 +- init/Makefile | 1 - init/do_mounts.c | 6 +- init/do_mounts.h | 22 - init/do_mounts_initrd.c | 83 ---- init/do_mounts_rd.c | 318 --------------- init/initramfs.c | 31 +- .../ktest/examples/bootconfigs/tracing.bconf | 3 - 16 files changed, 6 insertions(+), 873 deletions(-) delete mode 100644 Documentation/admin-guide/initrd.rst delete mode 100644 init/do_mounts_rd.c diff --git a/Documentation/admin-guide/devices.txt b/Documentation/admin-gu= ide/devices.txt index 94c98be1329a..27835389ca49 100644 --- a/Documentation/admin-guide/devices.txt +++ b/Documentation/admin-guide/devices.txt @@ -21,12 +21,6 @@ 0 =3D /dev/ram0 First RAM disk 1 =3D /dev/ram1 Second RAM disk ... - 250 =3D /dev/initrd Initial RAM disk - - Older kernels had /dev/ramdisk (1, 1) here. - /dev/initrd refers to a RAM disk which was preloaded - by the boot loader; newer kernels use /dev/ram0 for - the initrd. =20 2 char Pseudo-TTY masters 0 =3D /dev/ptyp0 First PTY master diff --git a/Documentation/admin-guide/index.rst b/Documentation/admin-guid= e/index.rst index 259d79fbeb94..b3b2628ea515 100644 --- a/Documentation/admin-guide/index.rst +++ b/Documentation/admin-guide/index.rst @@ -51,7 +51,6 @@ Booting the kernel bootconfig kernel-parameters efi-stub - initrd =20 =20 Tracking down and identifying problems diff --git a/Documentation/admin-guide/initrd.rst b/Documentation/admin-gui= de/initrd.rst deleted file mode 100644 index 67bbad8806e8..000000000000 --- a/Documentation/admin-guide/initrd.rst +++ /dev/null @@ -1,383 +0,0 @@ -Using the initial RAM disk (initrd) -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - -Written 1996,2000 by Werner Almesberger and -Hans Lermen - - -initrd provides the capability to load a RAM disk by the boot loader. -This RAM disk can then be mounted as the root file system and programs -can be run from it. Afterwards, a new root file system can be mounted -from a different device. The previous root (from initrd) is then moved -to a directory and can be subsequently unmounted. - -initrd is mainly designed to allow system startup to occur in two phases, -where the kernel comes up with a minimum set of compiled-in drivers, and -where additional modules are loaded from initrd. - -This document gives a brief overview of the use of initrd. A more detailed -discussion of the boot process can be found in [#f1]_. - - -Operation ---------- - -When using initrd, the system typically boots as follows: - - 1) the boot loader loads the kernel and the initial RAM disk - 2) the kernel converts initrd into a "normal" RAM disk and - frees the memory used by initrd - 3) if the root device is not ``/dev/ram0``, the old (deprecated) - change_root procedure is followed. see the "Obsolete root change - mechanism" section below. - 4) root device is mounted. if it is ``/dev/ram0``, the initrd image is - then mounted as root - 5) /sbin/init is executed (this can be any valid executable, including - shell scripts; it is run with uid 0 and can do basically everything - init can do). - 6) init mounts the "real" root file system - 7) init places the root file system at the root directory using the - pivot_root system call - 8) init execs the ``/sbin/init`` on the new root filesystem, performing - the usual boot sequence - 9) the initrd file system is removed - -Note that changing the root directory does not involve unmounting it. -It is therefore possible to leave processes running on initrd during that -procedure. Also note that file systems mounted under initrd continue to -be accessible. - - -Boot command-line options -------------------------- - -initrd adds the following new options:: - - initrd=3D (e.g. LOADLIN) - - Loads the specified file as the initial RAM disk. When using LILO, you - have to specify the RAM disk image file in /etc/lilo.conf, using the - INITRD configuration variable. - - noinitrd - - initrd data is preserved but it is not converted to a RAM disk and - the "normal" root file system is mounted. initrd data can be read - from /dev/initrd. Note that the data in initrd can have any structure - in this case and doesn't necessarily have to be a file system image. - This option is used mainly for debugging. - - Note: /dev/initrd is read-only and it can only be used once. As soon - as the last process has closed it, all data is freed and /dev/initrd - can't be opened anymore. - - root=3D/dev/ram0 - - initrd is mounted as root, and the normal boot procedure is followed, - with the RAM disk mounted as root. - -Compressed cpio images ----------------------- - -Recent kernels have support for populating a ramdisk from a compressed cpio -archive. On such systems, the creation of a ramdisk image doesn't need to -involve special block devices or loopbacks; you merely create a directory = on -disk with the desired initrd content, cd to that directory, and run (as an -example):: - - find . | cpio --quiet -H newc -o | gzip -9 -n > /boot/imagefile.img - -Examining the contents of an existing image file is just as simple:: - - mkdir /tmp/imagefile - cd /tmp/imagefile - gzip -cd /boot/imagefile.img | cpio -imd --quiet - -Installation ------------- - -First, a directory for the initrd file system has to be created on the -"normal" root file system, e.g.:: - - # mkdir /initrd - -The name is not relevant. More details can be found on the -:manpage:`pivot_root(2)` man page. - -If the root file system is created during the boot procedure (i.e. if -you're building an install floppy), the root file system creation -procedure should create the ``/initrd`` directory. - -If initrd will not be mounted in some cases, its content is still -accessible if the following device has been created:: - - # mknod /dev/initrd b 1 250 - # chmod 400 /dev/initrd - -Second, the kernel has to be compiled with RAM disk support and with -support for the initial RAM disk enabled. Also, at least all components -needed to execute programs from initrd (e.g. executable format and file -system) must be compiled into the kernel. - -Third, you have to create the RAM disk image. This is done by creating a -file system on a block device, copying files to it as needed, and then -copying the content of the block device to the initrd file. With recent -kernels, at least three types of devices are suitable for that: - - - a floppy disk (works everywhere but it's painfully slow) - - a RAM disk (fast, but allocates physical memory) - - a loopback device (the most elegant solution) - -We'll describe the loopback device method: - - 1) make sure loopback block devices are configured into the kernel - 2) create an empty file system of the appropriate size, e.g.:: - - # dd if=3D/dev/zero of=3Dinitrd bs=3D300k count=3D1 - # mke2fs -F -m0 initrd - - (if space is critical, you may want to use the Minix FS instead of Ext= 2) - 3) mount the file system, e.g.:: - - # mount -t ext2 -o loop initrd /mnt - - 4) create the console device:: - - # mkdir /mnt/dev - # mknod /mnt/dev/console c 5 1 - - 5) copy all the files that are needed to properly use the initrd - environment. Don't forget the most important file, ``/sbin/init`` - - .. note:: ``/sbin/init`` permissions must include "x" (execute). - - 6) correct operation the initrd environment can frequently be tested - even without rebooting with the command:: - - # chroot /mnt /sbin/init - - This is of course limited to initrds that do not interfere with the - general system state (e.g. by reconfiguring network interfaces, - overwriting mounted devices, trying to start already running demons, - etc. Note however that it is usually possible to use pivot_root in - such a chroot'ed initrd environment.) - 7) unmount the file system:: - - # umount /mnt - - 8) the initrd is now in the file "initrd". Optionally, it can now be - compressed:: - - # gzip -9 initrd - -For experimenting with initrd, you may want to take a rescue floppy and -only add a symbolic link from ``/sbin/init`` to ``/bin/sh``. Alternatively= , you -can try the experimental newlib environment [#f2]_ to create a small -initrd. - -Finally, you have to boot the kernel and load initrd. Almost all Linux -boot loaders support initrd. Since the boot process is still compatible -with an older mechanism, the following boot command line parameters -have to be given:: - - root=3D/dev/ram0 rw - -(rw is only necessary if writing to the initrd file system.) - -With LOADLIN, you simply execute:: - - LOADLIN initrd=3D - -e.g.:: - - LOADLIN C:\LINUX\BZIMAGE initrd=3DC:\LINUX\INITRD.GZ root=3D/dev/ram0 rw - -With LILO, you add the option ``INITRD=3D`` to either the global sec= tion -or to the section of the respective kernel in ``/etc/lilo.conf``, and pass -the options using APPEND, e.g.:: - - image =3D /bzImage - initrd =3D /boot/initrd.gz - append =3D "root=3D/dev/ram0 rw" - -and run ``/sbin/lilo`` - -For other boot loaders, please refer to the respective documentation. - -Now you can boot and enjoy using initrd. - - -Changing the root device ------------------------- - -When finished with its duties, init typically changes the root device -and proceeds with starting the Linux system on the "real" root device. - -The procedure involves the following steps: - - mounting the new root file system - - turning it into the root file system - - removing all accesses to the old (initrd) root file system - - unmounting the initrd file system and de-allocating the RAM disk - -Mounting the new root file system is easy: it just needs to be mounted on -a directory under the current root. Example:: - - # mkdir /new-root - # mount -o ro /dev/hda1 /new-root - -The root change is accomplished with the pivot_root system call, which -is also available via the ``pivot_root`` utility (see :manpage:`pivot_root= (8)` -man page; ``pivot_root`` is distributed with util-linux version 2.10h or h= igher -[#f3]_). ``pivot_root`` moves the current root to a directory under the new -root, and puts the new root at its place. The directory for the old root -must exist before calling ``pivot_root``. Example:: - - # cd /new-root - # mkdir initrd - # pivot_root . initrd - -Now, the init process may still access the old root via its -executable, shared libraries, standard input/output/error, and its -current root directory. All these references are dropped by the -following command:: - - # exec chroot . what-follows dev/console 2>&1 - -Where what-follows is a program under the new root, e.g. ``/sbin/init`` -If the new root file system will be used with udev and has no valid -``/dev`` directory, udev must be initialized before invoking chroot in ord= er -to provide ``/dev/console``. - -Note: implementation details of pivot_root may change with time. In order -to ensure compatibility, the following points should be observed: - - - before calling pivot_root, the current directory of the invoking - process should point to the new root directory - - use . as the first argument, and the _relative_ path of the directory - for the old root as the second argument - - a chroot program must be available under the old and the new root - - chroot to the new root afterwards - - use relative paths for dev/console in the exec command - -Now, the initrd can be unmounted and the memory allocated by the RAM -disk can be freed:: - - # umount /initrd - # blockdev --flushbufs /dev/ram0 - -It is also possible to use initrd with an NFS-mounted root, see the -:manpage:`pivot_root(8)` man page for details. - - -Usage scenarios ---------------- - -The main motivation for implementing initrd was to allow for modular -kernel configuration at system installation. The procedure would work -as follows: - - 1) system boots from floppy or other media with a minimal kernel - (e.g. support for RAM disks, initrd, a.out, and the Ext2 FS) and - loads initrd - 2) ``/sbin/init`` determines what is needed to (1) mount the "real" root= FS - (i.e. device type, device drivers, file system) and (2) the - distribution media (e.g. CD-ROM, network, tape, ...). This can be - done by asking the user, by auto-probing, or by using a hybrid - approach. - 3) ``/sbin/init`` loads the necessary kernel modules - 4) ``/sbin/init`` creates and populates the root file system (this doesn= 't - have to be a very usable system yet) - 5) ``/sbin/init`` invokes ``pivot_root`` to change the root file system = and - execs - via chroot - a program that continues the installation - 6) the boot loader is installed - 7) the boot loader is configured to load an initrd with the set of - modules that was used to bring up the system (e.g. ``/initrd`` can be - modified, then unmounted, and finally, the image is written from - ``/dev/ram0`` or ``/dev/rd/0`` to a file) - 8) now the system is bootable and additional installation tasks can be - performed - -The key role of initrd here is to re-use the configuration data during -normal system operation without requiring the use of a bloated "generic" -kernel or re-compiling or re-linking the kernel. - -A second scenario is for installations where Linux runs on systems with -different hardware configurations in a single administrative domain. In -such cases, it is desirable to generate only a small set of kernels -(ideally only one) and to keep the system-specific part of configuration -information as small as possible. In this case, a common initrd could be -generated with all the necessary modules. Then, only ``/sbin/init`` or a f= ile -read by it would have to be different. - -A third scenario is more convenient recovery disks, because information -like the location of the root FS partition doesn't have to be provided at -boot time, but the system loaded from initrd can invoke a user-friendly -dialog and it can also perform some sanity checks (or even some form of -auto-detection). - -Last not least, CD-ROM distributors may use it for better installation -from CD, e.g. by using a boot floppy and bootstrapping a bigger RAM disk -via initrd from CD; or by booting via a loader like ``LOADLIN`` or directly -from the CD-ROM, and loading the RAM disk from CD without need of -floppies. - - -Obsolete root change mechanism ------------------------------- - -The following mechanism was used before the introduction of pivot_root. -Current kernels still support it, but you should _not_ rely on its -continued availability. - -It works by mounting the "real" root device (i.e. the one set with rdev -in the kernel image or with root=3D... at the boot command line) as the -root file system when linuxrc exits. The initrd file system is then -unmounted, or, if it is still busy, moved to a directory ``/initrd``, if -such a directory exists on the new root file system. - -In order to use this mechanism, you do not have to specify the boot -command options root, init, or rw. (If specified, they will affect -the real root file system, not the initrd environment.) - -If /proc is mounted, the "real" root device can be changed from within -linuxrc by writing the number of the new root FS device to the special -file /proc/sys/kernel/real-root-dev, e.g.:: - - # echo 0x301 >/proc/sys/kernel/real-root-dev - -Note that the mechanism is incompatible with NFS and similar file -systems. - -This old, deprecated mechanism is commonly called ``change_root``, while -the new, supported mechanism is called ``pivot_root``. - - -Mixed change_root and pivot_root mechanism ------------------------------------------- - -In case you did not want to use ``root=3D/dev/ram0`` to trigger the pivot_= root -mechanism, you may create both ``/linuxrc`` and ``/sbin/init`` in your ini= trd -image. - -``/linuxrc`` would contain only the following:: - - #! /bin/sh - mount -n -t proc proc /proc - echo 0x0100 >/proc/sys/kernel/real-root-dev - umount -n /proc - -Once linuxrc exited, the kernel would mount again your initrd as root, -this time executing ``/sbin/init``. Again, it would be the duty of this in= it -to build the right environment (maybe using the ``root=3D device`` passed = on -the cmdline) before the final execution of the real ``/sbin/init``. - - -Resources ---------- - -.. [#f1] Almesberger, Werner; "Booting Linux: The History and the Future" - https://www.almesberger.net/cv/papers/ols2k-9.ps.gz -.. [#f2] newlib package (experimental), with initrd example - https://www.sourceware.org/newlib/ -.. [#f3] util-linux: Miscellaneous utilities for Linux - https://www.kernel.org/pub/linux/utils/util-linux/ diff --git a/Documentation/admin-guide/nfs/nfsroot.rst b/Documentation/admi= n-guide/nfs/nfsroot.rst index 135218f33394..60452bdfd454 100644 --- a/Documentation/admin-guide/nfs/nfsroot.rst +++ b/Documentation/admin-guide/nfs/nfsroot.rst @@ -18,8 +18,8 @@ Mounting the root filesystem via NFS (nfsroot) In order to use a diskless system, such as an X-terminal or printer server= for example, it is necessary for the root filesystem to be present on a non-di= sk device. This may be an initramfs (see -Documentation/filesystems/ramfs-rootfs-initramfs.rst), a ramdisk (see -Documentation/admin-guide/initrd.rst) or a filesystem mounted via NFS. The +Documentation/filesystems/ramfs-rootfs-initramfs.rst) +or a filesystem mounted via NFS. The following text describes on how to use NFS for the root filesystem. For th= e rest of this text 'client' means the diskless system, and 'server' means the NFS server. diff --git a/Documentation/power/swsusp-dmcrypt.rst b/Documentation/power/s= wsusp-dmcrypt.rst index 426df59172cd..afb29a58fdf8 100644 --- a/Documentation/power/swsusp-dmcrypt.rst +++ b/Documentation/power/swsusp-dmcrypt.rst @@ -10,7 +10,7 @@ Some prerequisites: You know how dm-crypt works. If not, visit the following web page: http://www.saout.de/misc/dm-crypt/ You have read Documentation/power/swsusp.rst and understand it. -You did read Documentation/admin-guide/initrd.rst and know how an initrd w= orks. +You did read Documentation/filesystems/ramfs-rootfs-initramfs.rst and know= how an initrd works. You know how to create or how to modify an initrd. =20 Now your system is properly set up, your disk is encrypted except for diff --git a/fs/init.c b/fs/init.c index eef5124885e3..dfa50474647c 100644 --- a/fs/init.c +++ b/fs/init.c @@ -27,20 +27,6 @@ int __init init_mount(const char *dev_name, const char *= dir_name, return ret; } =20 -int __init init_umount(const char *name, int flags) -{ - int lookup_flags =3D LOOKUP_MOUNTPOINT; - struct path path; - int ret; - - if (!(flags & UMOUNT_NOFOLLOW)) - lookup_flags |=3D LOOKUP_FOLLOW; - ret =3D kern_path(name, lookup_flags, &path); - if (ret) - return ret; - return path_umount(&path, flags); -} - int __init init_chdir(const char *filename) { struct path path; diff --git a/include/linux/init_syscalls.h b/include/linux/init_syscalls.h index 92045d18cbfc..0bdbc458a881 100644 --- a/include/linux/init_syscalls.h +++ b/include/linux/init_syscalls.h @@ -2,7 +2,6 @@ =20 int __init init_mount(const char *dev_name, const char *dir_name, const char *type_page, unsigned long flags, void *data_page); -int __init init_umount(const char *name, int flags); int __init init_chdir(const char *filename); int __init init_chroot(const char *filename); int __init init_chown(const char *filename, uid_t user, gid_t group, int f= lags); diff --git a/include/linux/initrd.h b/include/linux/initrd.h index b42235c21444..cc389ef1a738 100644 --- a/include/linux/initrd.h +++ b/include/linux/initrd.h @@ -3,8 +3,6 @@ #ifndef __LINUX_INITRD_H #define __LINUX_INITRD_H =20 -#define INITRD_MINOR 250 /* shouldn't collide with /dev/ram* too soon ... = */ - /* 1 if it is not an error if initrd_start < memory_start */ extern int initrd_below_start_ok; =20 diff --git a/init/Kconfig b/init/Kconfig index e3eb63eadc87..0263c08960bc 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1441,7 +1441,7 @@ config BLK_DEV_INITRD boot loader (loadlin or lilo) and that is mounted as root before the normal boot procedure. It is typically used to load modules needed to mount the "real" root file system, - etc. See for details. + etc. See fo= r details. =20 If RAM disk support (BLK_DEV_RAM) is also included, this also enables initial RAM disk (initrd) support and adds diff --git a/init/Makefile b/init/Makefile index d6f75d8907e0..b020154b3d2a 100644 --- a/init/Makefile +++ b/init/Makefile @@ -17,7 +17,6 @@ obj-$(CONFIG_INITRAMFS_TEST) +=3D initramfs_test.o obj-y +=3D init_task.o =20 mounts-y :=3D do_mounts.o -mounts-$(CONFIG_BLK_DEV_RAM) +=3D do_mounts_rd.o mounts-$(CONFIG_BLK_DEV_INITRD) +=3D do_mounts_initrd.o =20 # diff --git a/init/do_mounts.c b/init/do_mounts.c index 0f2f44e6250c..f0b1a83dbda4 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -452,7 +452,7 @@ static dev_t __init parse_root_device(char *root_device= _name) } =20 /* - * Prepare the namespace - decide what/where to mount, load ramdisks, etc. + * Prepare the namespace - decide what/where to mount, etc. */ void __init prepare_namespace(void) { @@ -476,13 +476,9 @@ void __init prepare_namespace(void) if (saved_root_name[0]) ROOT_DEV =3D parse_root_device(saved_root_name); =20 - if (initrd_load(saved_root_name)) - goto out; - if (root_wait) wait_for_root(saved_root_name); mount_root(saved_root_name); -out: devtmpfs_mount(); init_mount(".", "/", NULL, MS_MOVE, NULL); init_chroot("."); diff --git a/init/do_mounts.h b/init/do_mounts.h index 6069ea3eb80d..6c7a535e71ce 100644 --- a/init/do_mounts.h +++ b/init/do_mounts.h @@ -22,28 +22,6 @@ static inline __init int create_dev(char *name, dev_t de= v) return init_mknod(name, S_IFBLK | 0600, new_encode_dev(dev)); } =20 -#ifdef CONFIG_BLK_DEV_RAM - -int __init rd_load_disk(int n); -int __init rd_load_image(char *from); - -#else - -static inline int rd_load_disk(int n) { return 0; } -static inline int rd_load_image(char *from) { return 0; } - -#endif - -#ifdef CONFIG_BLK_DEV_INITRD -bool __init initrd_load(char *root_device_name); -#else -static inline bool initrd_load(char *root_device_name) -{ - return false; - } - -#endif - /* Ensure that async file closing finished to prevent spurious errors. */ static inline void init_flush_fput(void) { diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c index f6867bad0d78..308744254c08 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c @@ -69,86 +69,3 @@ static int __init early_initrd(char *p) return early_initrdmem(p); } early_param("initrd", early_initrd); - -static int __init init_linuxrc(struct subprocess_info *info, struct cred *= new) -{ - ksys_unshare(CLONE_FS | CLONE_FILES); - console_on_rootfs(); - /* move initrd over / and chdir/chroot in initrd root */ - init_chdir("/root"); - init_mount(".", "/", NULL, MS_MOVE, NULL); - init_chroot("."); - ksys_setsid(); - return 0; -} - -static void __init handle_initrd(char *root_device_name) -{ - struct subprocess_info *info; - static char *argv[] =3D { "linuxrc", NULL, }; - extern char *envp_init[]; - int error; - - pr_warn("using deprecated initrd support, will be removed soon.\n"); - - real_root_dev =3D new_encode_dev(ROOT_DEV); - create_dev("/dev/root.old", Root_RAM0); - /* mount initrd on rootfs' /root */ - mount_root_generic("/dev/root.old", root_device_name, - root_mountflags & ~MS_RDONLY); - init_mkdir("/old", 0700); - init_chdir("/old"); - - info =3D call_usermodehelper_setup("/linuxrc", argv, envp_init, - GFP_KERNEL, init_linuxrc, NULL, NULL); - if (!info) - return; - call_usermodehelper_exec(info, UMH_WAIT_PROC|UMH_FREEZABLE); - - /* move initrd to rootfs' /old */ - init_mount("..", ".", NULL, MS_MOVE, NULL); - /* switch root and cwd back to / of rootfs */ - init_chroot(".."); - - if (new_decode_dev(real_root_dev) =3D=3D Root_RAM0) { - init_chdir("/old"); - return; - } - - init_chdir("/"); - ROOT_DEV =3D new_decode_dev(real_root_dev); - mount_root(root_device_name); - - printk(KERN_NOTICE "Trying to move old root to /initrd ... "); - error =3D init_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL); - if (!error) - printk("okay\n"); - else { - if (error =3D=3D -ENOENT) - printk("/initrd does not exist. Ignored.\n"); - else - printk("failed\n"); - printk(KERN_NOTICE "Unmounting old root\n"); - init_umount("/old", MNT_DETACH); - } -} - -bool __init initrd_load(char *root_device_name) -{ - if (mount_initrd) { - create_dev("/dev/ram", Root_RAM0); - /* - * Load the initrd data into /dev/ram0. Execute it as initrd - * unless /dev/ram0 is supposed to be our actual root device, - * in that case the ram disk is just set up here, and gets - * mounted in the normal path. - */ - if (rd_load_image("/initrd.image") && ROOT_DEV !=3D Root_RAM0) { - init_unlink("/initrd.image"); - handle_initrd(root_device_name); - return true; - } - } - init_unlink("/initrd.image"); - return false; -} diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c deleted file mode 100644 index 864fa88d9f89..000000000000 --- a/init/do_mounts_rd.c +++ /dev/null @@ -1,318 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "do_mounts.h" -#include "../fs/squashfs/squashfs_fs.h" - -#include - -static struct file *in_file, *out_file; -static loff_t in_pos, out_pos; - -static int __init crd_load(decompress_fn deco); - -/* - * This routine tries to find a RAM disk image to load, and returns the - * number of blocks to read for a non-compressed image, 0 if the image - * is a compressed image, and -1 if an image with the right magic - * numbers could not be found. - * - * We currently check for the following magic numbers: - * minix - * ext2 - * romfs - * cramfs - * squashfs - * gzip - * bzip2 - * lzma - * xz - * lzo - * lz4 - */ -static int __init -identify_ramdisk_image(struct file *file, loff_t pos, - decompress_fn *decompressor) -{ - const int size =3D 512; - struct minix_super_block *minixsb; - struct romfs_super_block *romfsb; - struct cramfs_super *cramfsb; - struct squashfs_super_block *squashfsb; - int nblocks =3D -1; - unsigned char *buf; - const char *compress_name; - unsigned long n; - int start_block =3D 0; - - buf =3D kmalloc(size, GFP_KERNEL); - if (!buf) - return -ENOMEM; - - minixsb =3D (struct minix_super_block *) buf; - romfsb =3D (struct romfs_super_block *) buf; - cramfsb =3D (struct cramfs_super *) buf; - squashfsb =3D (struct squashfs_super_block *) buf; - memset(buf, 0xe5, size); - - /* - * Read block 0 to test for compressed kernel - */ - pos =3D start_block * BLOCK_SIZE; - kernel_read(file, buf, size, &pos); - - *decompressor =3D decompress_method(buf, size, &compress_name); - if (compress_name) { - printk(KERN_NOTICE "RAMDISK: %s image found at block %d\n", - compress_name, start_block); - if (!*decompressor) - printk(KERN_EMERG - "RAMDISK: %s decompressor not configured!\n", - compress_name); - nblocks =3D 0; - goto done; - } - - /* romfs is at block zero too */ - if (romfsb->word0 =3D=3D ROMSB_WORD0 && - romfsb->word1 =3D=3D ROMSB_WORD1) { - printk(KERN_NOTICE - "RAMDISK: romfs filesystem found at block %d\n", - start_block); - nblocks =3D (ntohl(romfsb->size)+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS; - goto done; - } - - if (cramfsb->magic =3D=3D CRAMFS_MAGIC) { - printk(KERN_NOTICE - "RAMDISK: cramfs filesystem found at block %d\n", - start_block); - nblocks =3D (cramfsb->size + BLOCK_SIZE - 1) >> BLOCK_SIZE_BITS; - goto done; - } - - /* squashfs is at block zero too */ - if (le32_to_cpu(squashfsb->s_magic) =3D=3D SQUASHFS_MAGIC) { - printk(KERN_NOTICE - "RAMDISK: squashfs filesystem found at block %d\n", - start_block); - nblocks =3D (le64_to_cpu(squashfsb->bytes_used) + BLOCK_SIZE - 1) - >> BLOCK_SIZE_BITS; - goto done; - } - - /* - * Read 512 bytes further to check if cramfs is padded - */ - pos =3D start_block * BLOCK_SIZE + 0x200; - kernel_read(file, buf, size, &pos); - - if (cramfsb->magic =3D=3D CRAMFS_MAGIC) { - printk(KERN_NOTICE - "RAMDISK: cramfs filesystem found at block %d\n", - start_block); - nblocks =3D (cramfsb->size + BLOCK_SIZE - 1) >> BLOCK_SIZE_BITS; - goto done; - } - - /* - * Read block 1 to test for minix and ext2 superblock - */ - pos =3D (start_block + 1) * BLOCK_SIZE; - kernel_read(file, buf, size, &pos); - - /* Try minix */ - if (minixsb->s_magic =3D=3D MINIX_SUPER_MAGIC || - minixsb->s_magic =3D=3D MINIX_SUPER_MAGIC2) { - printk(KERN_NOTICE - "RAMDISK: Minix filesystem found at block %d\n", - start_block); - nblocks =3D minixsb->s_nzones << minixsb->s_log_zone_size; - goto done; - } - - /* Try ext2 */ - n =3D ext2_image_size(buf); - if (n) { - printk(KERN_NOTICE - "RAMDISK: ext2 filesystem found at block %d\n", - start_block); - nblocks =3D n; - goto done; - } - - printk(KERN_NOTICE - "RAMDISK: Couldn't find valid RAM disk image starting at %d.\n", - start_block); - -done: - kfree(buf); - return nblocks; -} - -static unsigned long nr_blocks(struct file *file) -{ - struct inode *inode =3D file->f_mapping->host; - - if (!S_ISBLK(inode->i_mode)) - return 0; - return i_size_read(inode) >> 10; -} - -int __init rd_load_image(char *from) -{ - int res =3D 0; - unsigned long rd_blocks, devblocks; - int nblocks, i; - char *buf =3D NULL; - unsigned short rotate =3D 0; - decompress_fn decompressor =3D NULL; -#if !defined(CONFIG_S390) - char rotator[4] =3D { '|' , '/' , '-' , '\\' }; -#endif - - out_file =3D filp_open("/dev/ram", O_RDWR, 0); - if (IS_ERR(out_file)) - goto out; - - in_file =3D filp_open(from, O_RDONLY, 0); - if (IS_ERR(in_file)) - goto noclose_input; - - in_pos =3D 0; - nblocks =3D identify_ramdisk_image(in_file, in_pos, &decompressor); - if (nblocks < 0) - goto done; - - if (nblocks =3D=3D 0) { - if (crd_load(decompressor) =3D=3D 0) - goto successful_load; - goto done; - } - - /* - * NOTE NOTE: nblocks is not actually blocks but - * the number of kibibytes of data to load into a ramdisk. - */ - rd_blocks =3D nr_blocks(out_file); - if (nblocks > rd_blocks) { - printk("RAMDISK: image too big! (%dKiB/%ldKiB)\n", - nblocks, rd_blocks); - goto done; - } - - /* - * OK, time to copy in the data - */ - if (strcmp(from, "/initrd.image") =3D=3D 0) - devblocks =3D nblocks; - else - devblocks =3D nr_blocks(in_file); - - if (devblocks =3D=3D 0) { - printk(KERN_ERR "RAMDISK: could not determine device size\n"); - goto done; - } - - buf =3D kmalloc(BLOCK_SIZE, GFP_KERNEL); - if (!buf) { - printk(KERN_ERR "RAMDISK: could not allocate buffer\n"); - goto done; - } - - printk(KERN_NOTICE "RAMDISK: Loading %dKiB [%ld disk%s] into ram disk... = ", - nblocks, ((nblocks-1)/devblocks)+1, nblocks>devblocks ? "s" : ""); - for (i =3D 0; i < nblocks; i++) { - if (i && (i % devblocks =3D=3D 0)) { - pr_cont("done disk #1.\n"); - rotate =3D 0; - fput(in_file); - break; - } - kernel_read(in_file, buf, BLOCK_SIZE, &in_pos); - kernel_write(out_file, buf, BLOCK_SIZE, &out_pos); -#if !defined(CONFIG_S390) - if (!(i % 16)) { - pr_cont("%c\b", rotator[rotate & 0x3]); - rotate++; - } -#endif - } - pr_cont("done.\n"); - -successful_load: - res =3D 1; -done: - fput(in_file); -noclose_input: - fput(out_file); -out: - kfree(buf); - init_unlink("/dev/ram"); - return res; -} - -int __init rd_load_disk(int n) -{ - create_dev("/dev/root", ROOT_DEV); - create_dev("/dev/ram", MKDEV(RAMDISK_MAJOR, n)); - return rd_load_image("/dev/root"); -} - -static int exit_code; -static int decompress_error; - -static long __init compr_fill(void *buf, unsigned long len) -{ - long r =3D kernel_read(in_file, buf, len, &in_pos); - if (r < 0) - printk(KERN_ERR "RAMDISK: error while reading compressed data"); - else if (r =3D=3D 0) - printk(KERN_ERR "RAMDISK: EOF while reading compressed data"); - return r; -} - -static long __init compr_flush(void *window, unsigned long outcnt) -{ - long written =3D kernel_write(out_file, window, outcnt, &out_pos); - if (written !=3D outcnt) { - if (decompress_error =3D=3D 0) - printk(KERN_ERR - "RAMDISK: incomplete write (%ld !=3D %ld)\n", - written, outcnt); - decompress_error =3D 1; - return -1; - } - return outcnt; -} - -static void __init error(char *x) -{ - printk(KERN_ERR "%s\n", x); - exit_code =3D 1; - decompress_error =3D 1; -} - -static int __init crd_load(decompress_fn deco) -{ - int result; - - if (!deco) { - pr_emerg("Invalid ramdisk decompression routine. " - "Select appropriate config option.\n"); - panic("Could not decompress initial ramdisk image."); - } - - result =3D deco(NULL, 0, compr_fill, compr_flush, NULL, NULL, error); - if (decompress_error) - result =3D 1; - return result; -} diff --git a/init/initramfs.c b/init/initramfs.c index 097673b97784..850cb0de873e 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -692,28 +692,6 @@ static inline bool kexec_free_initrd(void) } #endif /* CONFIG_KEXEC_CORE */ =20 -#ifdef CONFIG_BLK_DEV_RAM -static void __init populate_initrd_image(char *err) -{ - ssize_t written; - struct file *file; - loff_t pos =3D 0; - - printk(KERN_INFO "rootfs image is not initramfs (%s); looks like an initr= d\n", - err); - file =3D filp_open("/initrd.image", O_WRONLY|O_CREAT|O_LARGEFILE, 0700); - if (IS_ERR(file)) - return; - - written =3D xwrite(file, (char *)initrd_start, initrd_end - initrd_start, - &pos); - if (written !=3D initrd_end - initrd_start) - pr_err("/initrd.image: incomplete write (%zd !=3D %ld)\n", - written, initrd_end - initrd_start); - fput(file); -} -#endif /* CONFIG_BLK_DEV_RAM */ - static void __init do_populate_rootfs(void *unused, async_cookie_t cookie) { /* Load the built in initramfs */ @@ -724,18 +702,11 @@ static void __init do_populate_rootfs(void *unused, a= sync_cookie_t cookie) if (!initrd_start || IS_ENABLED(CONFIG_INITRAMFS_FORCE)) goto done; =20 - if (IS_ENABLED(CONFIG_BLK_DEV_RAM)) - printk(KERN_INFO "Trying to unpack rootfs image as initramfs...\n"); - else - printk(KERN_INFO "Unpacking initramfs...\n"); + printk(KERN_INFO "Unpacking initramfs...\n"); =20 err =3D unpack_to_rootfs((char *)initrd_start, initrd_end - initrd_start); if (err) { -#ifdef CONFIG_BLK_DEV_RAM - populate_initrd_image(err); -#else printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err); -#endif } =20 done: diff --git a/tools/testing/ktest/examples/bootconfigs/tracing.bconf b/tools= /testing/ktest/examples/bootconfigs/tracing.bconf index bf117c78115a..c81ee5e30d2d 100644 --- a/tools/testing/ktest/examples/bootconfigs/tracing.bconf +++ b/tools/testing/ktest/examples/bootconfigs/tracing.bconf @@ -16,9 +16,6 @@ ftrace { myevent2 { probes =3D "vfs_write $arg2 +0($arg2):ustring $arg3"; } - myevent3 { - probes =3D "initrd_load"; - } enable } } --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (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 3F7EC1607A4 for ; Sat, 13 Sep 2025 00:52:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724728; cv=none; b=AEmCZ6B3ccxf95sE8GDG4reizADzHkyD4btQf9KhBJK5QVnZ9BBuGkN0wqpqNIrFmv7qVArzRL9Fd7e7t0xFxpHDt80uawAokcxtDAGb981sTVqrn5CkNLNMevOLKSFhbtc5m5XJ1p5oMuN2BHrKFxk3k2fF+WkkXO3sQ1ptGJ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724728; c=relaxed/simple; bh=XuzND7NDKgn2zA4fn1lxlzKccu851trJZxPzYXoIeEg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=InBNj/lI2FkJj1iPVw30WKHY/EqiUgLrTXkM3+TGrmrqJ4SZpvzl/cl9ynal6tqEEQbYDLgs/tiC0bEbUiToV/VxeZE9OP1e1eA+gjZ7umC9OACIIYCsfs8uk4zlE1ADMkk3SKozQftSLCF1VlF65uqQKN7x7PKm/Q0K78MYOBQ= 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=h5Sg4ace; arc=none smtp.client-ip=209.85.218.48 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="h5Sg4ace" Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-afcb7a16441so373495466b.2 for ; Fri, 12 Sep 2025 17:52:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757724723; x=1758329523; 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=MdGbmKxqlcMl0rLfzu7p7wshkZ7f+lqXVhPxNRPgNLM=; b=h5Sg4aceiNqsG09qyv4fQHdta7r18PBqbjnCUQpUsr0d59Jlkku5pnj1q118tscufQ WMm0Tfh6iedh86Y/SKnZfZobObCqOt05Ab4REpnZp0DyxdrxCyH/wwW78hq1FoyM0Lw/ OvqrrPUA7raZRjK9uZxseDWoGS1nsmULA8hWW/VG3h2Nngul2pms0DCxfWvDTvD5jxLA MuNNnUcH+9fJr/PtPD3KN4h6992YdjcNlSTFBtbjPkRmhqheYZgjU0wEnwf5OYU/Csxi zAoxqn0BDujXIYGUGBa1NoCGS66XPy89dIWzW0iGHjPMUIERZLv5f+Cc17wRsFkSq72O LFkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757724723; x=1758329523; 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=MdGbmKxqlcMl0rLfzu7p7wshkZ7f+lqXVhPxNRPgNLM=; b=h7RIIlcijqZLkKWztaIxxt5lhBsyHgPq3k/o1HK49EsZPyZBlLfT3lz1IDKGCXX74J X+PMstdBsFp7+ceL5TkLoxQ1W+x0I+GJQhV6COwDR6tdmB6KXls0dfDYyP9Dzd8mBuiY uP13cMLwm97PFEO9u62Eo5E77o8/Ski99Bx2HognwMB6F/cweXLQaIOftIi40vaVMUQJ uaz3eqvMtitChsOGV7u6pxLfHe4b5toouxXoJFMM2zbOOQYU/KGXD1sEMGk30l8M7H0h dlPcA8S6sxThVT2EgU5oGGrX4FyOpLbPKoT3qtR0wOh4SChkc7NGtqVEabWtgMzGYMW8 iTNw== X-Forwarded-Encrypted: i=1; AJvYcCXfbS5gc0pbLhNBPBQU4JWmMnldoaiR1j5JApUrFHp7FNvHrvYXqAfyTN5RiKpA1rq5ZiT7oCnMp5ZzEpQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwbyrXV/PRbqkvgLV0lYC0Mcj6+Q1yur7DHBuNNKx9bWlD/HlcJ BiQvTGFLBKn0tIXYjfN+pMAUkamSrxz6jsN2zfv4ghYdy9Nz56V5R2xK X-Gm-Gg: ASbGncu7S0TbGU2dQJhLnBBrswIVlyCPKz9bXaoPjgLjXvshKUb3HIsO6H0kR/D9t3p +jJLS3Z9mbK5FS0q7WvdYQI1jTYmW9k8B/6etpE1dlfJYTrY9uf0+mZJi8Uv7RQNA08lnA1HrnX wkkIb72CwGSrxmjs6gHxFjKSxwfMrTNL8jnTQj04n5s5KtfLPPkejBRo77VFGqyce7FE0i0gj02 NxkzXJTfQeLzdWqVA3sr7+NXE+XR3CBt8RbCdvgVtQ/hocgPmmQUl8xLpFqy7QvTZuw71MHVAeL veFgAcUiNGLh5+jyHbBTScMoacxiIoeMbIl6ypPimTLWH/AmR/iXrouiKin9TwQmU5JBFHQ8aPt UskTFXd1McXPNrDY9TbuTasbtAW6mjg== X-Google-Smtp-Source: AGHT+IEOxv4u1csoR3Asex+KK1PngLg51+/kQQMoUV5EwO+MoxI2Yose6oae6R3weUM2rN4atBIYiQ== X-Received: by 2002:a17:907:9801:b0:afe:6c9b:c828 with SMTP id a640c23a62f3a-b07c37b8165mr442852966b.61.1757724722473; Fri, 12 Sep 2025 17:52:02 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b08cab32303sm25787366b.72.2025.09.12.17.51.58 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 17:52:02 -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 11/62] init, efi: remove "noinitrd" command line parameter Date: Sat, 13 Sep 2025 00:37:50 +0000 Message-ID: <20250913003842.41944-12-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It was inconsistent before initrd removal: it mostly controlled initrd only, but in EFI stub boot mode it controlled both initrd and initramfs Signed-off-by: Askar Safin --- Documentation/admin-guide/kernel-parameters.txt | 3 --- arch/arm/configs/collie_defconfig | 2 +- arch/arm/configs/imx_v6_v7_defconfig | 2 +- arch/arm/configs/neponset_defconfig | 2 +- arch/arm/configs/spitz_defconfig | 2 +- drivers/firmware/efi/libstub/efi-stub-helper.c | 5 +---- init/do_mounts_initrd.c | 9 --------- 7 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentatio= n/admin-guide/kernel-parameters.txt index 07e8878f1e13..ad52e3d26014 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -4271,9 +4271,6 @@ Note that this argument takes precedence over the CONFIG_RCU_NOCB_CPU_DEFAULT_ALL option. =20 - noinitrd [RAM] Tells the kernel not to load any configured - initial RAM disk. - nointremap [X86-64,Intel-IOMMU,EARLY] Do not enable interrupt remapping. [Deprecated - use intremap=3Doff] diff --git a/arch/arm/configs/collie_defconfig b/arch/arm/configs/collie_de= fconfig index 578c6a4af620..00dc8ae22824 100644 --- a/arch/arm/configs/collie_defconfig +++ b/arch/arm/configs/collie_defconfig @@ -9,7 +9,7 @@ CONFIG_ARCH_MULTI_V4=3Dy # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_SA1100=3Dy CONFIG_SA1100_COLLIE=3Dy -CONFIG_CMDLINE=3D"noinitrd root=3D/dev/mtdblock2 rootfstype=3Djffs2 fbcon= =3Drotate:1" +CONFIG_CMDLINE=3D"root=3D/dev/mtdblock2 rootfstype=3Djffs2 fbcon=3Drotate:= 1" CONFIG_FPE_NWFPE=3Dy CONFIG_PM=3Dy # CONFIG_SWAP is not set diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6= _v7_defconfig index 9a57763a8d38..b53ae2c052fc 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -32,7 +32,7 @@ CONFIG_SMP=3Dy CONFIG_ARM_PSCI=3Dy CONFIG_HIGHMEM=3Dy CONFIG_ARCH_FORCE_MAX_ORDER=3D13 -CONFIG_CMDLINE=3D"noinitrd console=3Dttymxc0,115200" +CONFIG_CMDLINE=3D"console=3Dttymxc0,115200" CONFIG_CPU_FREQ=3Dy CONFIG_CPU_FREQ_STAT=3Dy CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=3Dy diff --git a/arch/arm/configs/neponset_defconfig b/arch/arm/configs/neponse= t_defconfig index 4d720001c12e..a61eb27373a8 100644 --- a/arch/arm/configs/neponset_defconfig +++ b/arch/arm/configs/neponset_defconfig @@ -9,7 +9,7 @@ CONFIG_ASSABET_NEPONSET=3Dy CONFIG_ZBOOT_ROM_TEXT=3D0x80000 CONFIG_ZBOOT_ROM_BSS=3D0xc1000000 CONFIG_ZBOOT_ROM=3Dy -CONFIG_CMDLINE=3D"console=3DttySA0,38400n8 cpufreq=3D221200 rw root=3D/dev= /mtdblock2 mtdparts=3Dsa1100:512K(boot),1M(kernel),2560K(initrd),4M(root) m= em=3D32M noinitrd initrd=3D0xc0800000,3M" +CONFIG_CMDLINE=3D"console=3DttySA0,38400n8 cpufreq=3D221200 rw root=3D/dev= /mtdblock2 mtdparts=3Dsa1100:512K(boot),1M(kernel),2560K(initrd),4M(root) m= em=3D32M initrd=3D0xc0800000,3M" CONFIG_FPE_NWFPE=3Dy CONFIG_PM=3Dy CONFIG_MODULES=3Dy diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defc= onfig index ac2a0f998c73..8582b6f2cf9d 100644 --- a/arch/arm/configs/spitz_defconfig +++ b/arch/arm/configs/spitz_defconfig @@ -10,7 +10,7 @@ CONFIG_ARCH_PXA=3Dy CONFIG_PXA_SHARPSL=3Dy CONFIG_MACH_AKITA=3Dy CONFIG_MACH_BORZOI=3Dy -CONFIG_CMDLINE=3D"console=3DttyS0,115200n8 console=3Dtty1 noinitrd root=3D= /dev/mtdblock2 rootfstype=3Djffs2 debug" +CONFIG_CMDLINE=3D"console=3DttyS0,115200n8 console=3Dtty1 root=3D/dev/mtdb= lock2 rootfstype=3Djffs2 debug" CONFIG_FPE_NWFPE=3Dy CONFIG_MODULES=3Dy CONFIG_MODULE_UNLOAD=3Dy diff --git a/drivers/firmware/efi/libstub/efi-stub-helper.c b/drivers/firmw= are/efi/libstub/efi-stub-helper.c index 7aa2f9ad2935..6d89bf941d57 100644 --- a/drivers/firmware/efi/libstub/efi-stub-helper.c +++ b/drivers/firmware/efi/libstub/efi-stub-helper.c @@ -21,7 +21,6 @@ bool efi_nochunk; bool efi_nokaslr =3D !IS_ENABLED(CONFIG_RANDOMIZE_BASE); bool efi_novamap; =20 -static bool efi_noinitrd; static bool efi_nosoftreserve; static bool efi_disable_pci_dma =3D IS_ENABLED(CONFIG_EFI_DISABLE_PCI_DMA); =20 @@ -75,8 +74,6 @@ efi_status_t efi_parse_options(char const *cmdline) efi_nokaslr =3D true; } else if (!strcmp(param, "quiet")) { efi_loglevel =3D CONSOLE_LOGLEVEL_QUIET; - } else if (!strcmp(param, "noinitrd")) { - efi_noinitrd =3D true; } else if (IS_ENABLED(CONFIG_X86_64) && !strcmp(param, "no5lvl")) { efi_no5lvl =3D true; } else if (IS_ENABLED(CONFIG_ARCH_HAS_MEM_ENCRYPT) && @@ -614,7 +611,7 @@ efi_status_t efi_load_initrd(efi_loaded_image_t *image, efi_status_t status =3D EFI_SUCCESS; struct linux_efi_initrd initrd, *tbl; =20 - if (!IS_ENABLED(CONFIG_BLK_DEV_INITRD) || efi_noinitrd) + if (!IS_ENABLED(CONFIG_BLK_DEV_INITRD)) return EFI_SUCCESS; =20 status =3D efi_load_initrd_dev_path(&initrd, hard_limit); diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c index 308744254c08..bec1c5d684a3 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c @@ -15,7 +15,6 @@ unsigned long initrd_start, initrd_end; int initrd_below_start_ok; static unsigned int real_root_dev; /* do_proc_dointvec cannot handle kdev_= t */ -static int __initdata mount_initrd =3D 1; =20 phys_addr_t phys_initrd_start __initdata; unsigned long phys_initrd_size __initdata; @@ -39,14 +38,6 @@ static __init int kernel_do_mounts_initrd_sysctls_init(v= oid) late_initcall(kernel_do_mounts_initrd_sysctls_init); #endif /* CONFIG_SYSCTL */ =20 -static int __init no_initrd(char *str) -{ - mount_initrd =3D 0; - return 1; -} - -__setup("noinitrd", no_initrd); - static int __init early_initrdmem(char *p) { phys_addr_t start; --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) (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 694BC11CA9 for ; Sat, 13 Sep 2025 00:53:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724792; cv=none; b=nVb4jb2BM9qjKJdvWSx+3DnT/1AntDkteACjBwhH/D/qhqoZcNrzBXJWylpBhAVMX09Y6wIYjuyXubyaWEXhl74WmMwb48TISI2/nsdIRyUESjG92ltAJoL+47+3DM5sC/kdL9pwBeYipt6NNu2qnyPpzi2tpj1qiVqHgArsWh0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724792; c=relaxed/simple; bh=x5NNVyIF1R5eB/2ANpkfxinDkMZ4lHIXMUphyEE4B54=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M9UW7n3OvxtWikFUrjrYODmMdXcaWvLaBzoEJgTjoM9zxigEJSW9ZIdUdAeMke5IzXcebEOghF6qi9Z39xE8bxZc+HLBCRsbWJTPLV3k7vrm7bJYx3f8jqDY0e4uCm+7kKtHd7cKVPDCPf//pOwmd3KgRg5kRX4nEtKjlNKg6Vw= 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=KGKxaKJJ; arc=none smtp.client-ip=209.85.208.53 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="KGKxaKJJ" Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-628f29d68ecso4906948a12.3 for ; Fri, 12 Sep 2025 17:53:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757724788; x=1758329588; 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=qPSAK5Fj4YQSUyCSJit30V41XYzOMHEP2qtV3SbNp88=; b=KGKxaKJJAEmQb6XUp3nRwdDCCxc+u+hiDne6Z/NPf1uixihci6LE3WqQK66IqjXdY4 Xb/SIK40YfVhek6ziJiApcg4teUqoYD+EUABCY4ZDilpIOpcxVeVt4xnP8Y3hMV830Jd BgRCzsXLuAt/64gYNvjWjTt0faQGDNZq5VES2V7LFxosLo+CyBxCqy0cFlgLTUfnd41y g5A5xGHGNE2ZrRJQWf4a4OG0sSfOVWqShG7OAgFkdiIQMVcQX7NExVIHdtllyNXyAyPe SXalYa6zfu1Jnx/pFPicmNaDPB3e4ynKFhUSu4lO0eWu8UaD73J3NMjlvmNcETXjIJLv jaTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757724788; x=1758329588; 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=qPSAK5Fj4YQSUyCSJit30V41XYzOMHEP2qtV3SbNp88=; b=a2ivUH85kxw4CXkyJrvbmPP3+6Mu6eHozba0y2MOzxkJlOscvhwF9tRCDahkkzqKxW D2MP5Ia9qDowBfjNdlCPwUIQnmECAYIc8mUT9TB1AF6JfVBlvnyzt6PBwwkVCy+VaU1/ +GhHouWXJG/jdvAy2uvEei6JEH8CRRy0WsBOFfEqhKOYMOhU57FwXVFSgcxR5vtSukY3 ka46Jj18OqvHOZZFiX7jp5dVVDQKBc6Yf4deXbEGCsmjd4JmXv2zeISOwYk0kXX8U2qD dJcB6LkRT+dScQMYItv9m7QAwRhO3s400sTTu4xqAR095fxPvGd+SDdfycPXAwLk/Bdy +YLQ== X-Forwarded-Encrypted: i=1; AJvYcCUV/QahGMKshXxohO1mVkHY6Ta2L0UTnzErxnfjkf86166f3UlC/RGuL67/0e6kWZU4NsQbGKAmVcqJb5c=@vger.kernel.org X-Gm-Message-State: AOJu0YyXZmzoo5P7r7HhR9Jt+ReiLwqsmt8IAAUIrVycWnATe0dRZkhe sEVIB9+9Y92MTKY0TFORxecho+xSnGV+kpzKumdAcCpjtBkye2+1kq74 X-Gm-Gg: ASbGncvdhYPEuCWJtC6YoI3aesMRYuX5GciRRtJ6Oszu0kwOd4VDQZ4Pw7lJt4Cw1fT 5QPBc55395NI08dSYtMJf6eBg6+uNMvMWX3GN/JSy2CROsgoKUR/y5lZKunUKNGWC+bH/GXzTqT N5iEMnyrlcVN5mvDkjHW4W+Jn4uqAfTsrHdyHai0kXUrfmnog7orie/DFR5JqZOjAHWy+zzVRYU MFvyGO7y7AEWV1ttV+x/2y4IlSvdYVomevPD17iW3QvQihHf7szI55KT71LNVcj/NPwP5pLwwMK grfUk07jiH1nPXTa1APdRQIkukRmuvHNTPMIgXPE9Ma9//jRyTSHCRiCbDNbyj4j0sWMa5EV8yW fe0jqpePk51cLh3I861FRZB4/LNp02A== X-Google-Smtp-Source: AGHT+IFLH7pCvIgBYHEI5BCYMw7iR++gatKVbesXKTxSAgJfhChwCe/V59YIUp3mRnJ55soXUGFMnw== X-Received: by 2002:a17:907:da4:b0:b04:2cc2:e49c with SMTP id a640c23a62f3a-b07c35bbcbbmr535243766b.19.1757724787764; Fri, 12 Sep 2025 17:53:07 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b32f22e8sm477916866b.87.2025.09.12.17.53.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 17:53:07 -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 12/62] init: remove /proc/sys/kernel/real-root-dev Date: Sat, 13 Sep 2025 00:37:51 +0000 Message-ID: <20250913003842.41944-13-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It was used for initrd support, which was removed in previous commits Signed-off-by: Askar Safin --- Documentation/admin-guide/sysctl/kernel.rst | 6 ------ include/uapi/linux/sysctl.h | 1 - init/do_mounts_initrd.c | 20 -------------------- 3 files changed, 27 deletions(-) diff --git a/Documentation/admin-guide/sysctl/kernel.rst b/Documentation/ad= min-guide/sysctl/kernel.rst index 8b49eab937d0..cc958c228bc2 100644 --- a/Documentation/admin-guide/sysctl/kernel.rst +++ b/Documentation/admin-guide/sysctl/kernel.rst @@ -1215,12 +1215,6 @@ that support this feature. =3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D =20 =20 -real-root-dev -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - -See Documentation/admin-guide/initrd.rst. - - reboot-cmd (SPARC only) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h index 63d1464cb71c..1c7fe0f4dca4 100644 --- a/include/uapi/linux/sysctl.h +++ b/include/uapi/linux/sysctl.h @@ -92,7 +92,6 @@ enum KERN_DOMAINNAME=3D8, /* string: domainname */ =20 KERN_PANIC=3D15, /* int: panic timeout */ - KERN_REALROOTDEV=3D16, /* real root device to mount after initrd */ =20 KERN_SPARC_REBOOT=3D21, /* reboot command on Sparc */ KERN_CTLALTDEL=3D22, /* int: allow ctl-alt-del to reboot */ diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c index bec1c5d684a3..d5264e9a52e0 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c @@ -14,30 +14,10 @@ =20 unsigned long initrd_start, initrd_end; int initrd_below_start_ok; -static unsigned int real_root_dev; /* do_proc_dointvec cannot handle kdev_= t */ =20 phys_addr_t phys_initrd_start __initdata; unsigned long phys_initrd_size __initdata; =20 -#ifdef CONFIG_SYSCTL -static const struct ctl_table kern_do_mounts_initrd_table[] =3D { - { - .procname =3D "real-root-dev", - .data =3D &real_root_dev, - .maxlen =3D sizeof(int), - .mode =3D 0644, - .proc_handler =3D proc_dointvec, - }, -}; - -static __init int kernel_do_mounts_initrd_sysctls_init(void) -{ - register_sysctl_init("kernel", kern_do_mounts_initrd_table); - return 0; -} -late_initcall(kernel_do_mounts_initrd_sysctls_init); -#endif /* CONFIG_SYSCTL */ - static int __init early_initrdmem(char *p) { phys_addr_t start; --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (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 E9116136672 for ; Sat, 13 Sep 2025 00:54:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724858; cv=none; b=cUSoqk59qqvdQoA7/0oM0ojmlHJW45rdQYdZXUPBjSKJf7bvFEjlrwUxTEcmPXfYlrMu2vpcj9KrpcyTnoyDJ4gnhJfARVxqt6fVAh17461ZBSS1IRlg3w/C1RWDRrBIR0k2mp+hQQ7Izy6j3nhT2dmkExVO7mQ5gVy3zhlY0+I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724858; c=relaxed/simple; bh=Jkxu5ZUI0H6ttWYEi4Z84BWe03GXjUbvUo6lUIoM5rY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MfVmQPDfCApDH/rJ9ZgRgvh9gzRGUAYPhBOWLWexaWbiHdtjdXmJi9rzWK4cfdoDgi0Ew3TedGLpUcMOkeoPSpH6mwAAjowGiE/Z1iiWtWYR3LLakLqE1FeJ/ITnZdoKToVIHCO+BsBkh3H+UKs58jQobqC+axHHhzHipk/dJBE= 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=NvT6e3Ob; arc=none smtp.client-ip=209.85.218.50 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="NvT6e3Ob" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-b07883a5feeso443760766b.1 for ; Fri, 12 Sep 2025 17:54:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757724853; x=1758329653; 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=HNaBVV0FpkKN0cdUwxCZ8fQss5eC0TEeX4co/5GJ2YQ=; b=NvT6e3ObjPoqqPnxCS60GcwK+yLdOlfN22Jnv2lY67RA/U1al/OIo3S4BwG/GKULue oTCpL8coYPSgHWTBgX54uuCFQcUq1LHojhq2vj1SU0MSap61BLXAyUIZVC9Wm8MNNSKQ ZIJvpWkRvAUlrww9wJU5tj83FxL3UGf6dcaoDZIF/lsSYItI6HG6gpZSxJDoVbVfCCvt rdp0lb5dDw4ls+bnlyJn6EDojFmBWvllBN5GBV9Xi95j5sjAnNZnWIgr/IlHDyt1nZ0I q0ApG2FWKiKptbJBqBpWqvJuz2WEwrbOtYPrqw9HMraW/wyXa/GoD5KUhkMKAT0DY+iW pwww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757724853; x=1758329653; 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=HNaBVV0FpkKN0cdUwxCZ8fQss5eC0TEeX4co/5GJ2YQ=; b=A3N+Hx2L8YrNSk/nywWOZR89bc0gQFIz0Djzx0YAIoy6p908xo711B8yi8lg0XZAIq CoJMHCTwRBTYJMa0O4mNIbkKTffCv/ySysrbkpA2lxHGSVXterZJMfPjtWgwbU8rWfrw UI8Jbzu25vRUTxWQ/9yBXcNKn3KegH7OBOOdDw3YpLm8wzdriivd6bGb3zmCWdjZ4cq7 HHhiIBxH0t/cPCRGSEnDgo4Fvn4rAclUN9YKDQeoNIijU++dAyb+/uPejAPdKUV+Ipri SFlE+ooCIlEA2orXcoNM9B26OZPxZ2hB+pslIjAYxmscaZhLO+kA3dm7m7agyQIEBvZ+ 1UQQ== X-Forwarded-Encrypted: i=1; AJvYcCW3y/YwrRhSvNC3pRu2ayL7KCMbI3MPa+Y5luP50F+RsDRvJL3aXNI6QtkCjvTP9pq45u1vRVWaBdaps6c=@vger.kernel.org X-Gm-Message-State: AOJu0YxE6yczziyrbax+qGi75plrr6+5BtZD432ad68TzcBZqQr9XDWO zTQp5Bn1Y7Wo51Hqc1OFtovTnqgEjOt0KoDImBlMLa6la6DUs9fhql3C X-Gm-Gg: ASbGncvO/nyhG49wdKeat6WD+n7yYjC+V3WOXq7CgX2C1ZFJ+ENM+fipo6b3uYZXvDa QjhkGhS1BB/4DFPg/FeEGoiULgEM87z/QqMAa1YYpeAAaVQatc44hQZOT7wW+YcH2K4iUUvsIZG B+K6B6ZlRm9meBz5EtaGpGCzlgxaIxKdfHAfz6kbQ980jGfO3ldOWIYBvWn+gjHReuOAEhkELGa hH8KO7p5o5nF3cmhbzTx05h3EFna7330aDxfRGXB6RTgZ1yCbyekzpDNvGJlCKgchggoY0CA03o Z/gFG7ZUAXqJr0Qs13auDV5Kp1qrE8yuimaWashotXSBrYxcJ3Ltvn8O3vWA8MfAX77XpImvx1L ordCw4q06Mg3LK7YCln/AjGuCnpNE2g== X-Google-Smtp-Source: AGHT+IFRAhwUW5zsVWdQl7rom9u+xngcdJiQFGIxNb9yv6sUT2JdEwHxw5AIwBj5WkuunZa0hzcUAQ== X-Received: by 2002:a17:907:7e8c:b0:b04:3513:5138 with SMTP id a640c23a62f3a-b07c37fca87mr474198766b.41.1757724853144; Fri, 12 Sep 2025 17:54:13 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b30da310sm465332066b.20.2025.09.12.17.54.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 17:54:12 -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 13/62] ext2: remove ext2_image_size and associated code Date: Sat, 13 Sep 2025 00:37:52 +0000 Message-ID: <20250913003842.41944-14-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It is not used anymore Signed-off-by: Askar Safin Acked-by: Jan Kara --- fs/ext2/ext2.h | 9 --------- include/linux/ext2_fs.h | 13 ------------- 2 files changed, 22 deletions(-) diff --git a/fs/ext2/ext2.h b/fs/ext2/ext2.h index cf97b76e9fd3..d623a14040d9 100644 --- a/fs/ext2/ext2.h +++ b/fs/ext2/ext2.h @@ -608,15 +608,6 @@ struct ext2_dir_entry_2 { ~EXT2_DIR_ROUND) #define EXT2_MAX_REC_LEN ((1<<16)-1) =20 -static inline void verify_offsets(void) -{ -#define A(x,y) BUILD_BUG_ON(x !=3D offsetof(struct ext2_super_block, y)); - A(EXT2_SB_MAGIC_OFFSET, s_magic); - A(EXT2_SB_BLOCKS_OFFSET, s_blocks_count); - A(EXT2_SB_BSIZE_OFFSET, s_log_block_size); -#undef A -} - /* * ext2 mount options */ diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h index 1fef88569037..e5ebe6cdf06c 100644 --- a/include/linux/ext2_fs.h +++ b/include/linux/ext2_fs.h @@ -27,17 +27,4 @@ */ #define EXT2_LINK_MAX 32000 =20 -#define EXT2_SB_MAGIC_OFFSET 0x38 -#define EXT2_SB_BLOCKS_OFFSET 0x04 -#define EXT2_SB_BSIZE_OFFSET 0x18 - -static inline u64 ext2_image_size(void *ext2_sb) -{ - __u8 *p =3D ext2_sb; - if (*(__le16 *)(p + EXT2_SB_MAGIC_OFFSET) !=3D cpu_to_le16(EXT2_SUPER_MAG= IC)) - return 0; - return (u64)le32_to_cpup((__le32 *)(p + EXT2_SB_BLOCKS_OFFSET)) << - le32_to_cpup((__le32 *)(p + EXT2_SB_BSIZE_OFFSET)); -} - #endif /* _LINUX_EXT2_FS_H */ --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (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 3F86F1459F7 for ; Sat, 13 Sep 2025 00:55:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724924; cv=none; b=UabF6g+EQB/abyOFQuV82FvZ3D0dgj2aTAHo0G3Y9Zzsw2XBm82FPzAovcMuTABtJXdTmjKduFMUS3qWBzIXw+vOGgoJL/dSKewTaEA5y435A3sqkV021qWveAVOv6mCzK2tpEMCG/+GfhdmPfmKplkPfFIQc1zRE9VNyV77Zvw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724924; c=relaxed/simple; bh=eGt6p4ZjFeLe2iCSQ/AVZeB8ZlFdwKPgIafRJWfogAQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bnlwQgQx1wEFrRR5E+9VsccNfY574DodmCS+ofVV1jBFk4qzMCDU/ErqMDH2rcTDyQY9ULYXIaIVkl0ZHyZxV93AYq6WoTUqwj9+42Bn7pHngqCKP2CsDwTLSz20T+1wf/wqfXZuXJMeinBfow8IGV/Nwi00VVt/0dQXokgQ0tM= 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=ZcTnakkN; arc=none smtp.client-ip=209.85.218.43 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="ZcTnakkN" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-b02c719a117so428952666b.1 for ; Fri, 12 Sep 2025 17:55:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757724918; x=1758329718; 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=brUQzIfCd0Hsthf3I31XlgkqlDsgZYmVYRfws4Ev66A=; b=ZcTnakkNmFYjQdChEjtaqK6HEcCwMgYs1rXg39HJJglVr4tegCv0ClYqye4QSs7t5B nBzOxKX9ffT0TGlKUjDYDesIqmLae9atQjaty2n+4wACYUDNbsMBnvrEJU+7A6wppzuf JkP2j1HCvksc/G+cQLMJEB26oM4bly9Uaf7len5rAcFLSnrXK4MmjB6mR3W+WbQQzGj2 s0B9VmeQH+3+7yBlflwz4FO+7d2p4g5iDNhDU+wLnTbCVPDkcwCH9tSj+xzmhjrzsvNV xYCXm15o6tgPTnS+wPQy3tNtCeu/09LXTyp/+sllPbYOZ5RLlcWPnA/Rd3bvtnahbXWt lKYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757724918; x=1758329718; 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=brUQzIfCd0Hsthf3I31XlgkqlDsgZYmVYRfws4Ev66A=; b=ZHqSH+tIBpFnk+iH/KLR1Y3bZPwJtTRYAa/iCbJpuUwj6/1xBajlBhS1FylMS+m7uN lARp5im5mxNtdeXRpd0zWk1z9v4oq6TjAjEhYI717GKo6CKO9CGiT8gweemPXxCIqVyz Jmehz58YQotcMPFApO1lFHzNEHKpuChsF3HARZYmph6PtEsuTFaQRumHmV0V7VAKvW2I w6ydcKCj2HbNWzMN/2SR3Jo443oIdnsm7xvc04apgZJff/hWe/ZcXLzVoh95PNKCDFLu YXCbRzqlYPsPUXXgZSW/6FlevCJL0GKVWCn404idJn/la7UtG5nhcckL7SjVgDh39owd Gy8Q== X-Forwarded-Encrypted: i=1; AJvYcCWg9wDt/h5gE7VKhUhoIPzh9tgUqxCF4jHeZH3zkHJzWJfE6Xev3JzNCvMiYuBjIn6KxVwhsJN8U9NMJE0=@vger.kernel.org X-Gm-Message-State: AOJu0Yw77PFNumJUqX0XHSFZVLQfWjZLojhF/W7XEYYmIo0sbGqn+X4S sA23u5A9X+VpCr4V02ltxbzMqghJKC4osYdnpQwNgypfxWS/wOwceOxB X-Gm-Gg: ASbGncvph8Uu3rbNrm3zQvo02BBIzxeY8fr5rVDhVlxK9vn9RoGjCk3ZWAGgcmBcV5r eMfChx9n1X7UAxwwYmRdp1/FxDmAlsCzTRh/2RdDshdKMFyFcBHoeenBwSNF5sigK3KoC7VWsks Y9Qv38afBgF67gifWZ0wFGrj+piEMkgMYLKVGy/rMwwMOpEnjZSapQo+2YkcDUPufGsUrWOZZpU wmmlpABmUjfxhHq5t4dwc+1nhruz8SvbED9OPWs3LU8+qKfrOJMrv8TT9wXt9NvJgUbcg7zd74l 2s2+k/vATwo7KuOihVVB5APDzTWDAJ38GmsRp3qyAocsvjMIKUUCeIbvi737XdxKLndEhnCHZ2o J0uZNsXb3MW3b6XA8UOEPq5qujg8kIA== X-Google-Smtp-Source: AGHT+IFhKaZuOZuHh9m3zt1qgdjZK8E9TZ0Xtk6mNXJxSo6OktVvoEgwN+yDRi3/QGfp0/HMd569SA== X-Received: by 2002:a17:907:3d8c:b0:afe:8b53:449c with SMTP id a640c23a62f3a-b07c37dc9f1mr442768666b.34.1757724918489; Fri, 12 Sep 2025 17:55:18 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b316e2d4sm471493966b.45.2025.09.12.17.55.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 17:55:18 -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 14/62] init: m68k, mips, powerpc, s390, sh: remove Root_RAM0 Date: Sat, 13 Sep 2025 00:37:53 +0000 Message-ID: <20250913003842.41944-15-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Root_RAM0 used to specify ramdisk as root device. It means nothing now, so let's remove it Signed-off-by: Askar Safin --- arch/m68k/kernel/uboot.c | 1 - arch/mips/kernel/setup.c | 1 - arch/powerpc/kernel/setup-common.c | 11 ++++------- arch/powerpc/platforms/powermac/setup.c | 4 +--- arch/s390/kernel/setup.c | 2 -- arch/sh/kernel/setup.c | 4 +--- include/linux/root_dev.h | 1 - init/do_mounts.c | 2 -- 8 files changed, 6 insertions(+), 20 deletions(-) diff --git a/arch/m68k/kernel/uboot.c b/arch/m68k/kernel/uboot.c index fa7c279ead5d..d278060a250c 100644 --- a/arch/m68k/kernel/uboot.c +++ b/arch/m68k/kernel/uboot.c @@ -83,7 +83,6 @@ static void __init parse_uboot_commandline(char *commandp= , int size) (uboot_initrd_end > uboot_initrd_start)) { initrd_start =3D uboot_initrd_start; initrd_end =3D uboot_initrd_end; - ROOT_DEV =3D Root_RAM0; pr_info("initrd at 0x%lx:0x%lx\n", initrd_start, initrd_end); } #endif /* if defined(CONFIG_BLK_DEV_INITRD) */ diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 11b9b6b63e19..a78e24873231 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -173,7 +173,6 @@ static unsigned long __init init_initrd(void) goto disable; } =20 - ROOT_DEV =3D Root_RAM0; return PFN_UP(end); disable: initrd_start =3D 0; diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup= -common.c index 68d47c53876c..97d330f3b8f1 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -363,17 +363,14 @@ void __init check_for_initrd(void) DBG(" -> check_for_initrd() initrd_start=3D0x%lx initrd_end=3D0x%lx\n", initrd_start, initrd_end); =20 - /* If we were passed an initrd, set the ROOT_DEV properly if the values - * look sensible. If not, clear initrd reference. + /* If we were not passed an sensible initramfs, clear initramfs reference. */ - if (is_kernel_addr(initrd_start) && is_kernel_addr(initrd_end) && - initrd_end > initrd_start) - ROOT_DEV =3D Root_RAM0; - else + if (!(is_kernel_addr(initrd_start) && is_kernel_addr(initrd_end) && + initrd_end > initrd_start)) initrd_start =3D initrd_end =3D 0; =20 if (initrd_start) - pr_info("Found initrd at 0x%lx:0x%lx\n", initrd_start, initrd_end); + pr_info("Found initramfs at 0x%lx:0x%lx\n", initrd_start, initrd_end); =20 DBG(" <- check_for_initrd()\n"); #endif /* CONFIG_BLK_DEV_INITRD */ diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platfor= ms/powermac/setup.c index eb092f293113..237d8386a3f4 100644 --- a/arch/powerpc/platforms/powermac/setup.c +++ b/arch/powerpc/platforms/powermac/setup.c @@ -296,9 +296,7 @@ static void __init pmac_setup_arch(void) #endif #ifdef CONFIG_PPC32 #ifdef CONFIG_BLK_DEV_INITRD - if (initrd_start) - ROOT_DEV =3D Root_RAM0; - else + if (!initrd_start) #endif ROOT_DEV =3D DEFAULT_ROOT_DEVICE; #endif diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 7b529868789f..a4ce721b7fe8 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -923,8 +923,6 @@ void __init setup_arch(char **cmdline_p) /* boot_command_line has been already set up in early.c */ *cmdline_p =3D boot_command_line; =20 - ROOT_DEV =3D Root_RAM0; - setup_initial_init_mm(_text, _etext, _edata, _end); =20 if (IS_ENABLED(CONFIG_EXPOLINE_AUTO)) diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 50f1d39fe34f..c4312ee13db9 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -147,10 +147,8 @@ void __init check_for_initrd(void) =20 /* * If we got this far in spite of the boot loader's best efforts - * to the contrary, assume we actually have a valid initrd and - * fix up the root dev. + * to the contrary, assume we actually have a valid initramfs. */ - ROOT_DEV =3D Root_RAM0; =20 /* * Address sanitization diff --git a/include/linux/root_dev.h b/include/linux/root_dev.h index 847c9a06101b..e411533b90b7 100644 --- a/include/linux/root_dev.h +++ b/include/linux/root_dev.h @@ -10,7 +10,6 @@ enum { Root_NFS =3D MKDEV(UNNAMED_MAJOR, 255), Root_CIFS =3D MKDEV(UNNAMED_MAJOR, 254), Root_Generic =3D MKDEV(UNNAMED_MAJOR, 253), - Root_RAM0 =3D MKDEV(RAMDISK_MAJOR, 0), }; =20 extern dev_t ROOT_DEV; diff --git a/init/do_mounts.c b/init/do_mounts.c index f0b1a83dbda4..5c407ca54063 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -437,8 +437,6 @@ static dev_t __init parse_root_device(char *root_device= _name) return Root_NFS; if (strcmp(root_device_name, "/dev/cifs") =3D=3D 0) return Root_CIFS; - if (strcmp(root_device_name, "/dev/ram") =3D=3D 0) - return Root_RAM0; =20 error =3D early_lookup_bdev(root_device_name, &dev); if (error) { --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 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 85F4E72623 for ; Sat, 13 Sep 2025 00:56:25 +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=1757724989; cv=none; b=u3M7SRFXWd2z1YGYlbtdoWMck6Jy4XXBrzzBWXbN+VSu6liXWZ/gd9Hq81UICzY9pqwPaLe/PkqBzR8fg3OXqtxPKoMNa7JnpN/fz77FzRu4XEUu1X+zueDW5b6kif+RdmbvgSj4twMmSKfa7OzW7mFoHy1lsWbKQqQ33Qx4ROw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757724989; c=relaxed/simple; bh=ds9VwpQCIQQEuVYbVkP08KSVWpcFcJ5JA8drV9AyvVg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cZVGWM1zWcKcDqsvnFLhETVW1bnlWgNG1y1aAKrfharjm97cf9nAZXwxIE2a2iEyLBpjbnCwOww98q2wK7VhIuXDU052SgWzcmkFpx8j07xiHVT+FiK8WoXO8znp4KhU+V2uyx7Y32kHbnOiFpcn3w/kX36u+CnADsJJcC8xLvQ= 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=dtiqmCR7; 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="dtiqmCR7" Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-b0415e03e25so324379166b.0 for ; Fri, 12 Sep 2025 17:56:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757724984; x=1758329784; 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=57Y6Vt+tKEG1ezrQxMY6sE7xxEuIy1GPZf6G9mOPdfs=; b=dtiqmCR7q8fQrujZcyidoHKzEpXWqVzSbJIyCLsw+S+iaLSpeTjjIImksv6bHWz8s5 EgMR9qHWRbW+iJ407fN+pRg39jUca5A1RrVCXvryTRkSsCcCRBy7P8v/FjEM2cRULRB/ Upqt8LUSyYMlpcM2ayIWDP+BuzU7VOzcL0cpdFD/Ypy5kblfRtosXml1v3sfFVyN/CSa JaTNPvO43NqTjObdxSrK5wQJ1Nl7QGp/hZaetC2Pg7WLtW0MrNVRtn+Mr877NBUqheaD OHVkjgU9fMp/bkTsjOZNPYOvxpS/AbSfChUCHmTHyYL0QF7CELgSjnc2KdPW5fuJspg+ Nmbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757724984; x=1758329784; 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=57Y6Vt+tKEG1ezrQxMY6sE7xxEuIy1GPZf6G9mOPdfs=; b=oTkT/R8y9d/mKO4HRpMN9KfRVDx7ouzepfTZ3VEhKrQppSlJcXtG9VxM55OFnq3uPE rOteOowk3+vUhMRm2RhcloTSHhd7dp7rW+TK3Wmqoz7z9q33Gul0aZqQpvX6Ii2nCQxE grFE4WnurcmsAsT/gi8iP12kn5S2R2M/w7fTtqTol+MTIzn5zSAjt22V6HFaCa17xVne kGYbgIFB+X8SP1a/JoIYiYFSRPObPMHHJwSFFnmD8QZucCkxGPO1cos71KRVEbvp3GIJ eZ15UYsWN+QsMCruIA3gV0tiNAd0FGEW+A5/7INSb1BdXjHDdgu2zdg0SYP5K6t6RzQg ZeHQ== X-Forwarded-Encrypted: i=1; AJvYcCU1z0tIypdEeUsuFRymeHkLuCan9kgrOHK1yFbzeI6CenZX8o/phceTxw2GTJ58jFEknEUTfQwi3tncIhc=@vger.kernel.org X-Gm-Message-State: AOJu0YzH4P7PhkCiSDplalVHQEJe8FOOX3n4bTbkqw4V3JDrZ5WYy02b TMKoo1vmRzbWlUgkBYFwLuLVPXg6vpeQex0sW0Cqrh/PdaFzhVOOHaOz X-Gm-Gg: ASbGncsl+OJ2l65MO6U5H8Abg7krfXLciMgD9jneG/A1S3m9XTnoJHs9dxGUrYLEXAO G8HeWtszlzGHgwd+bYnI76VAr1raZMkrmarTwoogQ7mgGvBlIWVlmb2qMWLLzoyXZ1BQd3JS1Xt OV0hpj+SE40b2wk4G9zNQbcHJ9artngDtIm82q8Um6OQe4ja6XPRzyEaQuBN69cyDP/QXljJHTY laApH4wtIqipTUQOY71VDG6TisRKjlqs4p07ke08LepXkwjS7PPYsWDXRR33hmC1FIYyuKaRpRq l8f3tUOTsoD1Qb47XFLffbZCj2Oa5cLJ0BQv1NcP6Bku8PI5RZ2qsESWAZg4lidr0X5moafrF/k puc24L87YS+2+Sv1SNwQsDrAlDHcqEA== X-Google-Smtp-Source: AGHT+IG1YYL4kFwbVvTnXfTe3odNA00ZLAAz2mLJaF8vV1UmquQWKJyitdN/Fum9NwuVLBLjujgrow== X-Received: by 2002:a17:907:3fa1:b0:b07:88aa:255b with SMTP id a640c23a62f3a-b07c354ed12mr458973666b.11.1757724983824; Fri, 12 Sep 2025 17:56:23 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b33478besm484760966b.99.2025.09.12.17.56.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 17:56:23 -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 15/62] doc: modernize Documentation/admin-guide/blockdev/ramdisk.rst Date: Sat, 13 Sep 2025 00:37:54 +0000 Message-ID: <20250913003842.41944-16-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Update it to reflect initrd removal Signed-off-by: Askar Safin --- .../admin-guide/blockdev/ramdisk.rst | 103 ++---------------- 1 file changed, 7 insertions(+), 96 deletions(-) diff --git a/Documentation/admin-guide/blockdev/ramdisk.rst b/Documentation= /admin-guide/blockdev/ramdisk.rst index e57c61108dbc..6289e085f18f 100644 --- a/Documentation/admin-guide/blockdev/ramdisk.rst +++ b/Documentation/admin-guide/blockdev/ramdisk.rst @@ -5,18 +5,14 @@ Using the RAM disk block device with Linux .. Contents: =20 1) Overview - 2) Kernel Command Line Parameters - 3) Using "rdev" - 4) An Example of Creating a Compressed RAM Disk + 2) Module parameters =20 =20 1) Overview ----------- =20 -The RAM disk driver is a way to use main system memory as a block device. = It -is required for initrd, an initial filesystem used if you need to load mod= ules -in order to access the root filesystem (see Documentation/admin-guide/init= rd.rst). It can -also be used for a temporary filesystem for crypto work, since the contents +The RAM disk driver is a way to use main system memory as a block device. +It can also be used for a temporary filesystem for crypto work, since the = contents are erased on reboot. =20 The RAM disk dynamically grows as more space is required. It does this by = using @@ -30,109 +26,24 @@ and (re)build the kernel. =20 To use RAM disk support with your system, run './MAKEDEV ram' from the /dev directory. RAM disks are all major number 1, and start with minor number 0 -for /dev/ram0, etc. If used, modern kernels use /dev/ram0 for an initrd. - -The new RAM disk also has the ability to load compressed RAM disk images, -allowing one to squeeze more programs onto an average installation or -rescue floppy disk. +for /dev/ram0, etc. =20 =20 -2) Parameters ---------------------------------- +2) Module parameters +-------------------- =20 -2a) Kernel Command Line Parameters - - ramdisk_size=3DN + rd_size=3DN Size of the ramdisk. =20 This parameter tells the RAM disk driver to set up RAM disks of N k size. = The default is 4096 (4 MB). =20 -2b) Module parameters - rd_nr /dev/ramX devices created. =20 max_part Maximum partition number. =20 - rd_size - See ramdisk_size. - -3) Using "rdev" ---------------- - -"rdev" is an obsolete, deprecated, antiquated utility that could be used -to set the boot device in a Linux kernel image. - -Instead of using rdev, just place the boot device information on the -kernel command line and pass it to the kernel from the bootloader. - -You can also pass arguments to the kernel by setting FDARGS in -arch/x86/boot/Makefile and specify in initrd image by setting FDINITRD in -arch/x86/boot/Makefile. - -Some of the kernel command line boot options that may apply here are:: - - ramdisk_size=3DM - -If you make a boot disk that has LILO, then for the above, you would use:: - - append =3D "ramdisk_size=3DM" - -4) An Example of Creating a Compressed RAM Disk ------------------------------------------------ - -To create a RAM disk image, you will need a spare block device to -construct it on. This can be the RAM disk device itself, or an -unused disk partition (such as an unmounted swap partition). For this -example, we will use the RAM disk device, "/dev/ram0". - -Note: This technique should not be done on a machine with less than 8 MB -of RAM. If using a spare disk partition instead of /dev/ram0, then this -restriction does not apply. - -a) Decide on the RAM disk size that you want. Say 2 MB for this example. - Create it by writing to the RAM disk device. (This step is not currently - required, but may be in the future.) It is wise to zero out the - area (esp. for disks) so that maximal compression is achieved for - the unused blocks of the image that you are about to create:: - - dd if=3D/dev/zero of=3D/dev/ram0 bs=3D1k count=3D2048 - -b) Make a filesystem on it. Say ext2fs for this example:: - - mke2fs -vm0 /dev/ram0 2048 - -c) Mount it, copy the files you want to it (eg: /etc/* /dev/* ...) - and unmount it again. - -d) Compress the contents of the RAM disk. The level of compression - will be approximately 50% of the space used by the files. Unused - space on the RAM disk will compress to almost nothing:: - - dd if=3D/dev/ram0 bs=3D1k count=3D2048 | gzip -v9 > /tmp/ram_image.gz - -e) Put the kernel onto the floppy:: - - dd if=3DzImage of=3D/dev/fd0 bs=3D1k - -f) Put the RAM disk image onto the floppy, after the kernel. Use an offset - that is slightly larger than the kernel, so that you can put another - (possibly larger) kernel onto the same floppy later without overlapping - the RAM disk image. An offset of 400 kB for kernels about 350 kB in - size would be reasonable. Make sure offset+size of ram_image.gz is - not larger than the total space on your floppy (usually 1440 kB):: - - dd if=3D/tmp/ram_image.gz of=3D/dev/fd0 bs=3D1k seek=3D400 - -g) Make sure that you have already specified the boot information in - FDARGS and FDINITRD or that you use a bootloader to pass kernel - command line boot options to the kernel. - -That is it. You now have your boot/root compressed RAM disk floppy. Some -users may wish to combine steps (d) and (f) by using a pipe. - =20 Paul Gortmaker 12/95 =20 --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (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 4C0576BB5B for ; Sat, 13 Sep 2025 00:57:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725053; cv=none; b=e4tTGWTLy+RR1lo1ocpf0T7OsaVWizx2Z9XJOfiWDj1aXEE1rMp0eySIBt79+EUPGZC4+0Ezw2+hiXt8IrJlp7RvoH0gTbya8a82ytEJwiHR85ocHEDfreMovdu7cMtiq7sfYt6T5NJmrNENSfK/Olk3xj6knJe2xcZD4bXdsHs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725053; c=relaxed/simple; bh=icqv9qJHo4M/f4BybNZRp4QArCkqmFyOuQeqTRdwg0I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hSznBpuOo/BdJV4mMRtp+ut8C8nxx+7FUBttN6TgvWJtQYA0+p7Y2JdFXq/Tw7Mh1Rxkx5wIif1QHrH+mfOxoD2hZ+wiTo6G3L6DzNahVH4717NgKLeEiImpBuA3lytjA4wxNStFs/qUi2K0mreq+gtsbeuQ4Wr05TSpn7tMTYI= 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=IxttpIxd; arc=none smtp.client-ip=209.85.218.45 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="IxttpIxd" Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-b04b55d5a2cso428008066b.2 for ; Fri, 12 Sep 2025 17:57:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757725050; x=1758329850; 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=ezI+jX/C/Y112e/n5Rz3xR2Z7MqtqGJhurNzHRBUkc4=; b=IxttpIxd7SK+1cAWw1/JNCEYJzFEye4jRVTGQOfbo1MNIq6mG5v8Y7onxIIuz13jHR nSd98sFpCzgmue005hvKDszQzXg5khhjThue5L+j/7rrDALA/jODXy5Itcc0VqIP1hlp 7lREmLms7JNHHRMSgpi3DF4Ip69vY+lt4UlDeIVBOrzTnPJTHtWZVTzqAZ32TSaaUPC5 71tw+FITO9Zg3Q/ktA+SeUhnAyBKxiVOVhxgrDJBPZr3AauXnvo8sWFhmedNgGFmaf4M HT2zNLMoK/nEhJetJGumkak/Jvy7jzRS3Tr/4UsuB4DXhw9C3A6DylwaX2WC9VSe8gPI KFhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757725050; x=1758329850; 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=ezI+jX/C/Y112e/n5Rz3xR2Z7MqtqGJhurNzHRBUkc4=; b=uXcClXxe5jzCBWvSkEaN+VxoPtSnylca1Q9/eSELhdPV3HEEOFFx78jTWE8PKj1x1i nqWzsZhsNEEwAM3Q7cAyQ6CcSfgn00U3YkQBLkfbUYan/Ju354OOfEHi5GambxYmhS0c HZrKOIKsfnRfYsNhenEcJ8250yBB/60sDMqIIf+eekTShmpDjKOjPWukgGuT8wK1V++o BB8w304PL4tubH7G4DxbK8jiYdws9CWDlAH/VyATR+M77RmcogDdeVP+m084NkCh7TPx Z10g4rDqGFUAkDVBJbjfz30/nvcqHi7mVI2KwnBlZZRX3/HfOpotNA3XPv3/Kixnj1mF uZww== X-Forwarded-Encrypted: i=1; AJvYcCVn0x9TK/1ZCQpWGiyNk2M2gb+YzEd9QcHUwZjURIZYzgjG3yMSOjPwLa01EzG4jh+57MuPS80xqDSQMgc=@vger.kernel.org X-Gm-Message-State: AOJu0Yx2Nuxtj+6hnDbB60DoRITxdVhJ1VAiz3iss7ZHMfho9Ewg22o2 nafcsM5ivdq/VskeD6e68MhIBTo5jaQJPtK3Fz4Tt0v/ZqM28n+7kmnp X-Gm-Gg: ASbGncvWLZq3iJdk08whMXCBAazUxdNaH5R1vGiZvl398CjdHzcOyOhk9bpt6UqdyZ7 VRBHe8d7PDIubikM334FVz/pZIj0VcHF7Gb5KbvgxFn89ral3afsehtXXJV7iytHEZu7Sfg3nyC ZRNiDbMUDyNDtKmSbe1DUTRzBaUdD7qKP3wXhBvI6Pd8tJlOoxulrzAuwmJmDoQscgDGEVQ52QF CU788gw4bZLgLEGG+Iq/lLl+Kx/7tb6+gEJEJPL2seRQHmTd2wTzMF3Pqt+w6T23jZy1oWrNjGi DM8pGlHL8ZHluey4Zow28nDdsOBvdgwXUuBZfurqjolxYMLAOv59J9HzIYLuOdkRwXqrOHuVkIZ 8ODOVWY919vlfuSXSwa7vcIJUuAHt/w== X-Google-Smtp-Source: AGHT+IGnRtXHmAlBOGcWImQD5jsKfQTyCdy3QliDqyqREaJdsFoBMJl1utqd/JT9F2sOVlrjQyooHw== X-Received: by 2002:a17:907:944b:b0:b04:ad1c:59e4 with SMTP id a640c23a62f3a-b07c35328admr535751966b.12.1757725049282; Fri, 12 Sep 2025 17:57:29 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b32dd47bsm478662366b.58.2025.09.12.17.57.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 17:57:28 -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 16/62] brd: remove "ramdisk_size" command line parameter Date: Sat, 13 Sep 2025 00:37:55 +0000 Message-ID: <20250913003842.41944-17-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It was used mostly for initrd. It could be used only if brd is built-in. Use "brd.rd_size" instead Signed-off-by: Askar Safin --- .../admin-guide/kernel-parameters.txt | 3 --- Documentation/arch/m68k/kernel-options.rst | 20 ++----------------- arch/arm/configs/s3c6400_defconfig | 2 +- drivers/block/brd.c | 10 ---------- 4 files changed, 3 insertions(+), 32 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentatio= n/admin-guide/kernel-parameters.txt index ad52e3d26014..e862a7b1d2ec 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -5279,9 +5279,6 @@ raid=3D [HW,RAID] See Documentation/admin-guide/md.rst. =20 - ramdisk_size=3D [RAM] Sizes of RAM disks in kilobytes - See Documentation/admin-guide/blockdev/ramdisk.rst. - random.trust_cpu=3Doff [KNL,EARLY] Disable trusting the use of the CPU's random number generator (if available) to diff --git a/Documentation/arch/m68k/kernel-options.rst b/Documentation/arc= h/m68k/kernel-options.rst index 2008a20b4329..f6469ebeb2c7 100644 --- a/Documentation/arch/m68k/kernel-options.rst +++ b/Documentation/arch/m68k/kernel-options.rst @@ -215,27 +215,11 @@ Devices possible for Atari: seconds. =20 =20 -2.6) ramdisk_size=3D ------------------- - -:Syntax: ramdisk_size=3D - -This option instructs the kernel to set up a ramdisk of the given -size in KBytes. Do not use this option if the ramdisk contents are -passed by bootstrap! In this case, the size is selected automatically -and should not be overwritten. - -The only application is for root filesystems on floppy disks, that -should be loaded into memory. To do that, select the corresponding -size of the disk as ramdisk size, and set the root device to the disk -drive (with "root=3D"). - - -2.7) swap=3D +2.5) swap=3D =20 I can't find any sign of this option in 2.2.6. =20 -2.8) buff=3D +2.6) buff=3D ----------- =20 I can't find any sign of this option in 2.2.6. diff --git a/arch/arm/configs/s3c6400_defconfig b/arch/arm/configs/s3c6400_= defconfig index a37e6ac40825..23635d5b9322 100644 --- a/arch/arm/configs/s3c6400_defconfig +++ b/arch/arm/configs/s3c6400_defconfig @@ -4,7 +4,7 @@ CONFIG_ARCH_MULTI_V6=3Dy # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_S3C64XX=3Dy CONFIG_MACH_WLF_CRAGG_6410=3Dy -CONFIG_CMDLINE=3D"console=3DttySAC0,115200 root=3D/dev/ram init=3D/linuxrc= initrd=3D0x51000000,6M ramdisk_size=3D6144" +CONFIG_CMDLINE=3D"console=3DttySAC0,115200 root=3D/dev/ram init=3D/linuxrc= initrd=3D0x51000000,6M" CONFIG_VFP=3Dy CONFIG_MODULES=3Dy CONFIG_MODULE_UNLOAD=3Dy diff --git a/drivers/block/brd.c b/drivers/block/brd.c index 72f02d2b8a99..05c4325904d2 100644 --- a/drivers/block/brd.c +++ b/drivers/block/brd.c @@ -222,16 +222,6 @@ MODULE_LICENSE("GPL"); MODULE_ALIAS_BLOCKDEV_MAJOR(RAMDISK_MAJOR); MODULE_ALIAS("rd"); =20 -#ifndef MODULE -/* Legacy boot options - nonmodular */ -static int __init ramdisk_size(char *str) -{ - rd_size =3D simple_strtol(str, NULL, 0); - return 1; -} -__setup("ramdisk_size=3D", ramdisk_size); -#endif - /* * The device scheme is derived from loop.c. Keep them in synch where poss= ible * (should share code eventually). --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) (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 8827272623 for ; Sat, 13 Sep 2025 00:58:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725118; cv=none; b=WQrLWtsrfK4sPi5M2llv7RTL3/K3Jj+ohwhfPZDSvVVECWzyWni1Qv2G6o9QpH4tO81/rLWQcaYN4s/7vAwtSdXzgrlIgZEIUmi56dEidmfIrYRwDhufPIbDNU9LxhgJ2nu8wC2Sgc0ViUnim/RhyEoAcY9f/vEL43DqSXAepqs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725118; c=relaxed/simple; bh=riLYrwvey4IG1vm31BCl7axPrjxd4nPuzw1Lf4FnM3A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UJ+82RYBssCPtEz2koBg88yJ8yHY80anL5JVLTmo26IAqUimL84v3VmYh24PtIe+Zx1QiczLApv2DX4uXP8oWn6C+HbUW2FtTPzMoY8Oj42ZVMzeYAhwvxFX6fSv6yaOCcQ6oLUxUhiGL1zgZpDOBlmiM4AfAwwVgxnf4d7/XMQ= 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=hKAdVg/A; arc=none smtp.client-ip=209.85.208.49 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="hKAdVg/A" Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-6228de280ccso4861916a12.3 for ; Fri, 12 Sep 2025 17:58:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757725115; x=1758329915; 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=2BXXMTZbWkKZqT8QgJ9Z777RqiFOaP2Wc1It8eJXku8=; b=hKAdVg/A1cgqKS6p9i2KuodzZogaEVcz6+R6REIkiNiIbFfMinE02lC9EOoe6YQ662 QoLR9T6aT3+M7BjTiV7UHhhnL8XkKjyZyIXFiPtCqdXyqRhXZQVCsC5d/pExy5n63UVD aP3IcvsxqqlBvJIhGWqLfrRjmqsx4H8gcINoCK2y+hNmwLXGrio/G7e159/gpZcMF69K kaZmEu4fumfSdszmb6RAwXH0qFnnNqWRKA9VZMV1du0FKs+yZoo8fyd8Vjq+UH3lzPCr jJbdtu7AJXlgY45fa3FMZxSgib30KPPXZPVWOybYPPZXcTs7CcclB57K/d1DO8TrpOBv 6XDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757725115; x=1758329915; 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=2BXXMTZbWkKZqT8QgJ9Z777RqiFOaP2Wc1It8eJXku8=; b=LRHMJNislB7G+lbl4j+VGeWgmzz03m0L+1d8ZKxoE2WG9NkH9Jl8E0m7kYQ5m4fmHO id+JmGlxCIoUAkbvVG60LjrKbr2C1yp7uJocqOQZveCttsmB/ff+AOQ+I+DAP2pDOlRT duLkfYpjRr87adArRwhvEFVuuCdP5Z178ReZTdtPGsaFv4Et1U0ul0arrY8wPwTpvH44 NKkLzdcP/D1qQ3UvFZ1wDmTYr7zNXQvx3v5C6Bod6cjBFczKjAnmHol7jl7n20QrCAna zyY8EY7QZOq3AgkTnm98kPqiaS9k1QsO6OlRSWGodc8IersqBDcC92gy5eAZtBeSvgSc Jemw== X-Forwarded-Encrypted: i=1; AJvYcCX5yZn9oACV0oOmUPPakBefksexvh1GZMEHzpYwBkjBNfzzDvIOegnUDHLD/zTNVbZ9O82OCTThXqA6118=@vger.kernel.org X-Gm-Message-State: AOJu0YwDZsnOK80DTj5ynHMk6qHlJd4SZS3iP7pljzabgasBEf2HwS1A +8r6k4vmy9nrxSXXDKrLxPf263x73ogsTFRNbp9tmcNCyyCM8nMHckQj X-Gm-Gg: ASbGncuAg3JsQSTrn/Rp5EvwDoZk8Fh52rI8TrZ4csQ3DLJQxWwedPffny6RrXOqBCD nv+Zo7tDkBu4xaD3hHbz0t4iaHZiRKiDe4DBgK4p0wzdL/QGsNGAO+eeH4K1Mlg7fCII0mIGpAT zWW25/ghCEz5crQ8DEdgLPA/6nC2epqYr1Iuz+1B1DTc7WN/KGcthc4LulN4+RVeoPPQzECPHTJ 4XR0MxaMOuxn2GzgV4grJyH5DQnQR2L1ehMc4iFa3SwdGUaAjvp049CLZ0UMb9Pi4uxhA83uRRq Ln8CeHNKuPc7j8XwOU3J2QIZr+p2um/mpjNjzFR6tPc3Ju61ET4+TliH9/k3HXRg7jfP6aFJ+NO naS8REGwH1yppuVGepVDvllbbG14mXQ== X-Google-Smtp-Source: AGHT+IF4XezAq8wXNO6voYrJeDnCFhU1tJ+TfyE7OJRqFWOCMlq1YMWoUA8uaJ4xPb3fA3w8qZjP4Q== X-Received: by 2002:a05:6402:5242:b0:628:a4fb:3b44 with SMTP id 4fb4d7f45d1cf-62ed825998fmr4961876a12.1.1757725114882; Fri, 12 Sep 2025 17:58:34 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id 4fb4d7f45d1cf-62ec33f3b16sm4143925a12.24.2025.09.12.17.58.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 17:58:34 -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 17/62] doc: modernize Documentation/filesystems/ramfs-rootfs-initramfs.rst Date: Sat, 13 Sep 2025 00:37:56 +0000 Message-ID: <20250913003842.41944-18-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Update it to reflect initrd removal. Also I specified that error reports should go to linux-doc@vger.kernel.org , because Rob Landley said that he keeps getting reports about this document and is unable to fix them Signed-off-by: Askar Safin --- .../filesystems/ramfs-rootfs-initramfs.rst | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Documentation/filesystems/ramfs-rootfs-initramfs.rst b/Documen= tation/filesystems/ramfs-rootfs-initramfs.rst index fa4f81099cb4..38a9cf11f547 100644 --- a/Documentation/filesystems/ramfs-rootfs-initramfs.rst +++ b/Documentation/filesystems/ramfs-rootfs-initramfs.rst @@ -8,6 +8,8 @@ October 17, 2005 =20 :Author: Rob Landley =20 +Report errors in this document to + What is ramfs? -------------- =20 @@ -101,9 +103,9 @@ archive is extracted into it, the kernel will fall thro= ugh to the older code to locate and mount a root partition, then exec some variant of /sbin/init out of that. =20 -All this differs from the old initrd in several ways: +All this differs from the old initrd (removed in 2025) in several ways: =20 - - The old initrd was always a separate file, while the initramfs archive= is + - The old initrd was always a separate file, while the initramfs archive= can be linked into the linux kernel image. (The directory ``linux-*/usr`` is devoted to generating this archive during the build.) =20 @@ -137,7 +139,7 @@ Populating initramfs: =20 The 2.6 kernel build process always creates a gzipped cpio format initramfs archive and links it into the resulting kernel binary. By default, this -archive is empty (consuming 134 bytes on x86). +archive is nearly empty (consuming 134 bytes on x86). =20 The config option CONFIG_INITRAMFS_SOURCE (in General Setup in menuconfig, and living in usr/Kconfig) can be used to specify a source for the @@ -222,15 +224,13 @@ use in place of the above config file:: External initramfs images: -------------------------- =20 -If the kernel has initrd support enabled, an external cpio.gz archive can = also -be passed into a 2.6 kernel in place of an initrd. In this case, the kern= el -will autodetect the type (initramfs, not initrd) and extract the external = cpio +If the kernel has CONFIG_BLK_DEV_INITRD enabled, an external cpio.gz archi= ve can also +be passed into a 2.6 kernel. In this case, the kernel will extract the ex= ternal cpio archive into rootfs before trying to run /init. =20 -This has the memory efficiency advantages of initramfs (no ramdisk block -device) but the separate packaging of initrd (which is nice if you have +This is nice if you have non-GPL code you'd like to run from initramfs, without conflating it with -the GPL licensed Linux kernel binary). +the GPL licensed Linux kernel binary. =20 It can also be used to supplement the kernel's built-in initramfs image. = The files in the external archive will overwrite any conflicting files in @@ -278,7 +278,7 @@ User Mode Linux, like so:: EOF gcc -static hello.c -o init echo init | cpio -o -H newc | gzip > test.cpio.gz - # Testing external initramfs using the initrd loading mechanism. + # Testing external initramfs. qemu -kernel /boot/vmlinuz -initrd test.cpio.gz /dev/zero =20 When debugging a normal root filesystem, it's nice to be able to boot with --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (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 137631494DB for ; Sat, 13 Sep 2025 00:59:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725185; cv=none; b=YkPzhtkJRvuM51M5lVPuFRmt7JI09x9w8y5vD5uRDduo7+LGx/kFrhAW4l7S2u3WSw7F+gzwQyRh0lwDYKMAL0EnJt5mKvehQkui7JJKF8LAF9t8FIVrzkMoRhVjVoOUIFQfg1nVjIG89wc4+A7M/FQ2ToGUZIgC2JyFtaR4BFo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725185; c=relaxed/simple; bh=96PHKpKkduNWBMWlLUmXlhnRkmSl0kWQr4vXMbTyP8M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t9A7bwCCK9207h4IRO8sfo8X1bqepkldQcoAzM/ZXslTmMYbjs540HtZnzoNQbWc/FvgUpBFRmS9+cuhYyuzL9P1p4tmIBEwkLZ2eTMrlC8+zrQ/8GBkNbVZNr6OGlIqLCYx/X74pb0WZ5cMWGowVXdwkiah1ndX5cON3xR5ifw= 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=ci0pMqa8; arc=none smtp.client-ip=209.85.218.53 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="ci0pMqa8" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-b046fc9f359so374954966b.0 for ; Fri, 12 Sep 2025 17:59:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757725180; x=1758329980; 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=6fWPoN959WwxjoYegCw0rDaXLTHmPmQJSliJ+OqkRJY=; b=ci0pMqa8PcrROKjXJdT069LT+w8CTpISWITlbfW/qtYcYwN/E9/DcLWNr/TpFiq3Ad QGOTKU53qwruWOiJs5/ZIzTaYZOVhAin6txhF3hPH2+OOlejQh98VgHulezohlcdDX2m cVt2AZhT8uGbv4Nec92z8dbeQO4pbNjpEB22pjBywRVyKIrHmXfsYMflIYY46yePUVU6 zdaw3mLA+fJrXUrEodmWoWb+jz/WCuthgKwyfcLoSI4ydp/v7D+ibgsafGt0CUUX2ZqN rS12SoggmKIRUIi+KHUDdtLvHiabq8s8eQgov8mHArCKjQL5NIxrYkQXHjJscrZKeMwI odwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757725180; x=1758329980; 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=6fWPoN959WwxjoYegCw0rDaXLTHmPmQJSliJ+OqkRJY=; b=G/WK1qb0HOaE4PopsyKaLKyc1NNPCr4uw+Vot/FIpnBfbbawW7pATxPnRq/GfqFxp+ bpAa3MXWwjRN8GD9KK0PJu8i+DrQS/uKM3Li/Ym2ggcIA0rmt8/gmz7slZuKGbUb4X5H t0st1h5/A79904R05tOs4gFTQLD4174MTV+AWzDiAsqw2Hs9FN7BVyMs7jxAarIhx9o2 mHaqea9bBspl3V3IxFv+AFefMSqk46yP4ykjJf0JIurFPo9K0FTqK9X2JBE8s9+GiXGT zEPlbWpoQxhYJYroySISW071IqR4b7jZ6guQ/ItmcpR6HZcVgNpahtKMg4z1hPfEF37D 4BGg== X-Forwarded-Encrypted: i=1; AJvYcCXFK6hjN7Kmh9ui3OdbTroqzjxgxGFH7ozDYC81vVJXMy4m9bbYhHNJ9mLqzq/scsPek6FfD21loSGwOHQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwGQ2HA3Ee1t+/JfZvZaGIhm4IFif6V/TLSvKSnLAsIIvg04JqL SOjK95swRXBrwztjOsRkqkpVlRFK/Aw4E1c9wNSVlFGuhvlSQkFmAAMS X-Gm-Gg: ASbGncunDCos+rgelMEUPd7iK2m5p2vWkfgjig7Vw62ta94vNJ6wqGVP6sBit3GRKQx 3NrOgGHHCBGRsXqBZ4RKuuT9oSsXhvf/4ZTFiQ0FF0gxQOC+8g0UOidijdpe9UVNwOQbcFBzdww 1/bD3mRh/bWODiR63ngjpg4ZIM/MC2gsFMRu4+u1ylqr4xhg6WaNG7D1M/TIliRMZlwElc1Yzbd +k5lNcZd2K9NF5ZpQnyNBPvzLQnd1ON/2fMxyPaoUDlyj3tCveBmvwUeQycH1JItEaX2FzkaMce hZanYX+V9RpaIaCg7x+dBd7fK7dufkghDZ+QI/Wnl9Wth9La1/ZxUgwEhoBVF5Cysor5Rh1cQMA g6xCb4RA+uZysKnW6IbU= X-Google-Smtp-Source: AGHT+IGLvsatTRrbnodGqisgzpCsfnT+5kjCyZkQGsCYdRKthq/XXLBOPdic+fyhUVGMnj7YztyCUg== X-Received: by 2002:a17:907:3f1a:b0:b04:ae7c:703e with SMTP id a640c23a62f3a-b07c35bca5fmr458205966b.24.1757725180390; Fri, 12 Sep 2025 17:59:40 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b3347a2dsm471368266b.98.2025.09.12.17.59.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 17:59:39 -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 18/62] doc: modernize Documentation/driver-api/early-userspace/early_userspace_support.rst Date: Sat, 13 Sep 2025 00:37:57 +0000 Message-ID: <20250913003842.41944-19-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Update it to reflect initrd removal Signed-off-by: Askar Safin --- .../early_userspace_support.rst | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/Documentation/driver-api/early-userspace/early_userspace_suppo= rt.rst b/Documentation/driver-api/early-userspace/early_userspace_support.r= st index 61bdeac1bae5..0ca923c1007b 100644 --- a/Documentation/driver-api/early-userspace/early_userspace_support.rst +++ b/Documentation/driver-api/early-userspace/early_userspace_support.rst @@ -127,28 +127,22 @@ mailing list at https://www.zytor.com/mailman/listinf= o/klibc How does it work? =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -The kernel has currently 3 ways to mount the root filesystem: +The kernel has currently 2 ways to mount the root filesystem: =20 a) all required device and filesystem drivers compiled into the kernel, no - initrd. init/main.c:init() will call prepare_namespace() to mount the + initramfs. init/main.c:kernel_init_freeable() will call prepare_namesp= ace() to mount the final root filesystem, based on the root=3D option and optional init=3D= to run - some other init binary than listed at the end of init/main.c:init(). + some other init binary than listed at the end of init/main.c:kernel_ini= t(). =20 -b) some device and filesystem drivers built as modules and stored in an - initrd. The initrd must contain a binary '/linuxrc' which is supposed = to - load these driver modules. It is also possible to mount the final root - filesystem via linuxrc and use the pivot_root syscall. The initrd is - mounted and executed via prepare_namespace(). - -c) using initramfs. The call to prepare_namespace() must be skipped. +b) using initramfs. The call to prepare_namespace() must be skipped. This means that a binary must do all the work. Said binary can be stor= ed into initramfs either via modifying usr/gen_init_cpio.c or via the new - initrd format, an cpio archive. It must be called "/init". This binary + initramfs format, an cpio archive. It must be called "/init". This bi= nary is responsible to do all the things prepare_namespace() would do. =20 To maintain backwards compatibility, the /init binary will only run if = it comes via an initramfs cpio archive. If this is not the case, - init/main.c:init() will run prepare_namespace() to mount the final root + init/main.c:kernel_init_freeable() will run prepare_namespace() to moun= t the final root and exec one of the predefined init binaries. =20 Bryan O'Sullivan --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.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 6AE36405F7 for ; Sat, 13 Sep 2025 01:00:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725252; cv=none; b=AYUbq/HD5JTNdzfXFSC12tzoptt03lcrYk3eMnLSAfjzdl5PQHCcS1Dv4QYq6K5UZgzkRbyOawYLlzMK2jxsEjMJ9NT4IjVcFAzdG+ZUVprM8zvgRUXIMYmdM1qJTq0LsqY6ju5Gy7Wd/4GEzrvI3kg7taqZH/WeCi6cHeWO/JA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725252; c=relaxed/simple; bh=WmrSleO2XCNYN8uS+EKoWQ5+E5KvuC+dDdzgWUmiL7o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=md/gC/OzLS8P8eV1VcKNdqKKaKladTZLP21WnxL7XmFKrxFs+Pt71fMFQUFppSvR0VVI/NyqrrAjw8aHMQ2eyoccBu7FQAOmtUi1nab28forEk5xIvPO0MFuVhGBEB7hOgIK5sxSao3ddNXH4+C/ZI2bXyY1sFEpv2uIKslzUDU= 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=MJWWdfHX; arc=none smtp.client-ip=209.85.218.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="MJWWdfHX" Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-b02c719a117so429255866b.1 for ; Fri, 12 Sep 2025 18:00:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757725246; x=1758330046; 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=XoEWD/ShpnwzaQ8ORuPz9c0ALO6Ls67XcNa7R8iqlGI=; b=MJWWdfHXdyyxn+qZxVH4DHxwMcIT4qAafC00rGnqPEIXIU4kCt7lhJt7wWfYB4mV2/ b+nlHZOUEAEpw32mNdqPDuX6WDTqq/uIRW7bD1vUv96nBtUPlucQkJRTPnNJk+5noDnW mKp4cAm4cmigaIxf0/9ZxG+YfkVzzcH8tVOxcUR0alnYeP6aBT+N5ORVCIcW2NRKeJKq GNHfkNo4L71eYJeK8rNpATt14Lc0+jxJqU9wUlpWjBHQnxAWeCAUXmsKwoFmWjNfjnfq XdF6VYrC81c7Xd4xquqLcjzB7zOhccL0yoqx7FTh5WW+sQ2vY82qrfFsQaZm/l7WuqSY oWeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757725246; x=1758330046; 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=XoEWD/ShpnwzaQ8ORuPz9c0ALO6Ls67XcNa7R8iqlGI=; b=DQj8TEemYyzPfGBzqQclnasIIpExEBTKDAr59+p3vhKtsqp2VzRxIBrgaSqJ+DcMSc DM1Z3xS1pU1Dq6aZd/JxA0gqrH10LcJSuIi6yfQ6AkajeojmrRDgDuiUFGFa+Lgj/RXx zNqqusHyPnEaFx9YF59U5q+RIa1CS5MUsFXyTxiy5TZv6Gv92VgjCz+vzKOU/wIUp2k+ ZcN8BY3F8sWKtT/GwFSNc2KSK/1R8PU2SESQGemKSNmApv7Lxs6qyL4WEgQOdPlQPWt9 JCy3hbL7oxGPLTcz1ery5oJOCxacFVDczkPc8DmLwMGjJVmxKm/y4DK/A7HpiWzMPeFd 33Ag== X-Forwarded-Encrypted: i=1; AJvYcCV01gR0HIup++QNCpcrkE5SyFD2hAk1LRJ/yCp90zI5GGDOicR5D/d7/KE2BWvUIO4ENBfVboVXnDqekeY=@vger.kernel.org X-Gm-Message-State: AOJu0YzRqsyj6FpzdThutIVplnPBx5zK3plIy2prN8THONZd0dUOeDpb NEp7t12soIsfKQuBUiAnOPxAP2QbTWtKdONmxN7hOsI5J74BlPNj4yl4XzBhW4YW X-Gm-Gg: ASbGncsFvbtFpAwyg2BPpoY5oyTu5GJjVB4+tyF9fh8Unhcis3ZTTe9VyR47rw4Uvan zds+kEUhdAZOt7+tWbymntS//Ej96jHV/22j+R2ZvPHg4x9ggdEd8bKN6Fn1wUhDcelz42iAk2b gR/0as49LyDh6ftZjYxuJkxlsixH9Yl1tg4zMwLkTDC4BlL+gFX0CDHWFQMuw2sdMZjlHN98lDL WvCAXVfffT95uWqzuN8VAMHLjNNdnhk/cEXLxgQNLcnbVshzoQwurA9eVWQf+5jHswG8Ihd71MM Z21Bz4mHAF3JMoSnWbZZ1FEFPzSNkIUWdj+Yi4Ich7KoFFiPloqXy9CWzSlmeqTD+uDqNgbZyGp q9ThoIcrzwZjGBNSj8tEp2R8Y/liN3A== X-Google-Smtp-Source: AGHT+IFN5sGx8Mx9m2aD2jbl3cQxyHXmx0LPyYapXdwnUwhP9+XvMT+8Mvs3QRhc/UxXrnFX4WIsYg== X-Received: by 2002:a17:907:daa:b0:b04:7232:3e97 with SMTP id a640c23a62f3a-b07c357507cmr467580066b.21.1757725245716; Fri, 12 Sep 2025 18:00:45 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b32dcf77sm470822766b.64.2025.09.12.18.00.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 18:00:45 -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 19/62] init: remove mentions of "ramdisk=" command line parameter Date: Sat, 13 Sep 2025 00:37:58 +0000 Message-ID: <20250913003842.41944-20-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It is already removed Signed-off-by: Askar Safin --- arch/arm/boot/dts/samsung/exynos4210-origen.dts | 2 +- arch/arm/boot/dts/samsung/exynos4210-smdkv310.dts | 2 +- arch/arm/boot/dts/samsung/exynos4412-smdk4412.dts | 2 +- arch/arm/boot/dts/samsung/exynos5250-smdk5250.dts | 2 +- arch/arm/configs/exynos_defconfig | 2 +- arch/arm/configs/s5pv210_defconfig | 2 +- drivers/block/Kconfig | 1 - 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/samsung/exynos4210-origen.dts b/arch/arm/boo= t/dts/samsung/exynos4210-origen.dts index f1927ca15e08..4dcf794bd18b 100644 --- a/arch/arm/boot/dts/samsung/exynos4210-origen.dts +++ b/arch/arm/boot/dts/samsung/exynos4210-origen.dts @@ -36,7 +36,7 @@ aliases { }; =20 chosen { - bootargs =3D "root=3D/dev/ram0 rw ramdisk=3D8192 initrd=3D0x41000000,8M = init=3D/linuxrc"; + bootargs =3D "root=3D/dev/ram0 rw initrd=3D0x41000000,8M init=3D/linuxrc= "; stdout-path =3D "serial2:115200n8"; }; =20 diff --git a/arch/arm/boot/dts/samsung/exynos4210-smdkv310.dts b/arch/arm/b= oot/dts/samsung/exynos4210-smdkv310.dts index 18f4f494093b..4cdeddeff3fc 100644 --- a/arch/arm/boot/dts/samsung/exynos4210-smdkv310.dts +++ b/arch/arm/boot/dts/samsung/exynos4210-smdkv310.dts @@ -30,7 +30,7 @@ aliases { }; =20 chosen { - bootargs =3D "root=3D/dev/ram0 rw ramdisk=3D8192 initrd=3D0x41000000,8M = init=3D/linuxrc"; + bootargs =3D "root=3D/dev/ram0 rw initrd=3D0x41000000,8M init=3D/linuxrc= "; stdout-path =3D "serial1:115200n8"; }; =20 diff --git a/arch/arm/boot/dts/samsung/exynos4412-smdk4412.dts b/arch/arm/b= oot/dts/samsung/exynos4412-smdk4412.dts index c83fb250e664..4b18cc55d6ca 100644 --- a/arch/arm/boot/dts/samsung/exynos4412-smdk4412.dts +++ b/arch/arm/boot/dts/samsung/exynos4412-smdk4412.dts @@ -27,7 +27,7 @@ aliases { }; =20 chosen { - bootargs =3D "root=3D/dev/ram0 rw ramdisk=3D8192 initrd=3D0x41000000,8M = init=3D/linuxrc"; + bootargs =3D "root=3D/dev/ram0 rw initrd=3D0x41000000,8M init=3D/linuxrc= "; stdout-path =3D "serial1:115200n8"; }; =20 diff --git a/arch/arm/boot/dts/samsung/exynos5250-smdk5250.dts b/arch/arm/b= oot/dts/samsung/exynos5250-smdk5250.dts index bb623726ef1e..4164c7c2a3eb 100644 --- a/arch/arm/boot/dts/samsung/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/samsung/exynos5250-smdk5250.dts @@ -27,7 +27,7 @@ memory@40000000 { }; =20 chosen { - bootargs =3D "root=3D/dev/ram0 rw ramdisk=3D8192 initrd=3D0x41000000,8M = init=3D/linuxrc"; + bootargs =3D "root=3D/dev/ram0 rw initrd=3D0x41000000,8M init=3D/linuxrc= "; stdout-path =3D "serial2:115200n8"; }; =20 diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_de= fconfig index 6915c766923a..77d3521f55d4 100644 --- a/arch/arm/configs/exynos_defconfig +++ b/arch/arm/configs/exynos_defconfig @@ -15,7 +15,7 @@ CONFIG_HIGHMEM=3Dy CONFIG_SECCOMP=3Dy CONFIG_ARM_APPENDED_DTB=3Dy CONFIG_ARM_ATAG_DTB_COMPAT=3Dy -CONFIG_CMDLINE=3D"root=3D/dev/ram0 rw ramdisk=3D8192 initrd=3D0x41000000,8= M console=3DttySAC1,115200 init=3D/linuxrc mem=3D256M" +CONFIG_CMDLINE=3D"root=3D/dev/ram0 rw initrd=3D0x41000000,8M console=3Dtty= SAC1,115200 init=3D/linuxrc mem=3D256M" CONFIG_CPU_FREQ=3Dy CONFIG_CPU_FREQ_STAT=3Dy CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=3Dy diff --git a/arch/arm/configs/s5pv210_defconfig b/arch/arm/configs/s5pv210_= defconfig index 02121eec3658..8ec82d9b51e4 100644 --- a/arch/arm/configs/s5pv210_defconfig +++ b/arch/arm/configs/s5pv210_defconfig @@ -8,7 +8,7 @@ CONFIG_KALLSYMS_ALL=3Dy CONFIG_ARCH_S5PV210=3Dy CONFIG_VMSPLIT_2G=3Dy CONFIG_ARM_APPENDED_DTB=3Dy -CONFIG_CMDLINE=3D"root=3D/dev/ram0 rw ramdisk=3D8192 initrd=3D0x20800000,8= M console=3DttySAC1,115200 init=3D/linuxrc" +CONFIG_CMDLINE=3D"root=3D/dev/ram0 rw initrd=3D0x20800000,8M console=3Dtty= SAC1,115200 init=3D/linuxrc" CONFIG_CPU_FREQ=3Dy CONFIG_CPU_FREQ_STAT=3Dy CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=3Dy diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index df38fb364904..8cf06e40f61c 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -229,7 +229,6 @@ config BLK_DEV_RAM store a copy of a minimal root file system off of a floppy into RAM during the initial install of Linux. =20 - Note that the kernel command line option "ramdisk=3DXX" is now obsolete. For details, read . =20 To compile this driver as a module, choose M here: the --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) (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 0FFAB136672 for ; Sat, 13 Sep 2025 01:01:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725315; cv=none; b=dwScL36s4Mp3NDATS2J9mjdu4QIjc2ZT+j01VCsNqO/EACmRilHVbMfprfTYYdYy/rhizrFCNP5KEZf52IldV69IKuTN0YBuE3vmiGDaDJQ5zLeKm2OPer8Nhm17KYanheom+DcCY0LuHlugLvUUsCHNWTbHnQIP4TSFy7RRrDY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725315; c=relaxed/simple; bh=ZZkhjwhbE6/y3ircTGqTXeD3vHrC5P1n1IkbBCMXiHo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cZfVyiGY2UOQm45fDo8ACXRlkXTQDw4b/IkdjwjqH4iFBDlvmgSZy9JX2nmTWiacRGsaDzPmOZqqm95P+g/XMlLM3ORlcIh0EJDyVCCxxiDYtdtdTpQBrfBit5TWeLKTmYj84ynxgct1OgSHXp3SHmG4HX3RkwGYDw5nVE6UJEI= 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=Q8rWdZ3v; arc=none smtp.client-ip=209.85.218.46 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="Q8rWdZ3v" Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-b0415e03e25so324647066b.0 for ; Fri, 12 Sep 2025 18:01:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757725311; x=1758330111; 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=XZEc0E3RkrtT53PvUmeExPdZ+yV/ZVWq9ufU5BOWTEg=; b=Q8rWdZ3vPQO1IDpapVGlhe3nSOw6j7XOwKTltsOQUoqihFACKG7eINVSNY+6Egf1rz 90lgEMndfc+LJNqp6Bw9t8ThVQ9YcGTLnXt4oOQQjnIiW539pIwvpIKLF2/M1970rnmG pF64Klv2fcCQ12ZentyM3dPxge5HtBxxT1o0lSI5zeEIQ6oEBFm+nmc0OIU8DRXsa8AF PHG5ixPgYhjikb9K0Kk7wBIAta4uu/bmCq+LgT6KPw9CuIbMv9L+7pWh69ssFc/sVlxg 2+UB7ZZgZABxPVpf6CdhmNDZ+v4yJor6u01ZLFjrHuprYzxjaWXtkZ0Xqy+GHquIIOw7 6Lfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757725311; x=1758330111; 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=XZEc0E3RkrtT53PvUmeExPdZ+yV/ZVWq9ufU5BOWTEg=; b=oHR/f/JaTEyg6KuZqILAT8pPtQLpAO5LWCiLQmjRiS+z4vTBKf2qfTs1o705xVhmtY J56D603HA24PB454MfT6GhbdYkXog6VvWUxfOIR3Jiwlt7Lzs7pCr9+Dn47FS/PHMmbj OGKIXnge9LWnyNBSKYHlksxPdsmJGVrHd0yk1g3NEtwF7JOVw0MTtnpk0SJt3hvXkq/m 4+tdbVsiRQwjzGeWI8jyTtarMk7aXeMDVlgA2Ng6ELmTBimJ8R23n7U+N5rboeF4hqyk 9tH/RpGGMa+xNLpBUwr7YbS3Rar2a/X90+pTDhVhmMiiFJU4tMgRSPYqBSKs7B7/pDn9 36DQ== X-Forwarded-Encrypted: i=1; AJvYcCULWJKrXjNK26aNCa3URAb7Hl8iPr8Y0HHt1/dEWM7m0aOGPTckzh8m9GzBawXn9SqsFobICz/CbMLqsEc=@vger.kernel.org X-Gm-Message-State: AOJu0Ywohi1OsK++JlfH3vIBGIkFSIqYyZu/9ydGmGpO4A4de7FNra7b upf04mXdcuk6kOA90X+YTWxcdE1enONwxX9/ZgPp1Ixnyq2BrVsU9XD0 X-Gm-Gg: ASbGncv95+OR8M5w7u7Z2AJJgmJAAm27kHPka8MKsOXkwsdlJAVPF9nlSqBVN4KH1dM Y3UwGUjbjeWPWO2qkjSRvQVgzE/hHAIrP4k5ctYpKM4jc3bxMgt24DOwYrLZ5S7pEy2ow4swbRY 4rzPN+juz8GBKT3OElegP0DfPocJez2fQrjrNvFn2PkM6WvgcfOMr3mlKHyBkArkFsYEuaEgfkA vXs/QfLLKCE0dXPhCfTQcazJRamROsCd/twP7H6oNMw5R8EwloCGxeEKWT0bOE9QopwbAB1yQjv Kym0u3U39RgVatlZUaMMBDmbswYj+8HfLY/ACFVv/INr0S1jZl+UsYoswGmZIXSgTi2g52VWTfK 9ooDHH3NWdkFJj4fLdMcRP2QiejP6zA== X-Google-Smtp-Source: AGHT+IEAi4xtonmhCaT33K2Hzh7yyRfMcFV0HvMSUAxXUtkPqhwfRFML0tJIQIoV7OGJ/h1kr7fV7w== X-Received: by 2002:a17:907:3d0c:b0:b04:7880:3e8c with SMTP id a640c23a62f3a-b07c3820252mr475574166b.38.1757725311044; Fri, 12 Sep 2025 18:01:51 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b317124esm476784166b.46.2025.09.12.18.01.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 18:01:50 -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 20/62] doc: remove Documentation/power/swsusp-dmcrypt.rst Date: Sat, 13 Sep 2025 00:37:59 +0000 Message-ID: <20250913003842.41944-21-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It contains obsolete initrd and lilo based instructions Signed-off-by: Askar Safin --- Documentation/power/index.rst | 1 - Documentation/power/swsusp-dmcrypt.rst | 140 ------------------ .../translations/zh_CN/power/index.rst | 1 - 3 files changed, 142 deletions(-) delete mode 100644 Documentation/power/swsusp-dmcrypt.rst diff --git a/Documentation/power/index.rst b/Documentation/power/index.rst index a0f5244fb427..9f1758c92e48 100644 --- a/Documentation/power/index.rst +++ b/Documentation/power/index.rst @@ -22,7 +22,6 @@ Power Management suspend-and-cpuhotplug suspend-and-interrupts swsusp-and-swap-files - swsusp-dmcrypt swsusp video tricks diff --git a/Documentation/power/swsusp-dmcrypt.rst b/Documentation/power/s= wsusp-dmcrypt.rst deleted file mode 100644 index afb29a58fdf8..000000000000 --- a/Documentation/power/swsusp-dmcrypt.rst +++ /dev/null @@ -1,140 +0,0 @@ -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -How to use dm-crypt and swsusp together -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - -Author: Andreas Steinmetz - - - -Some prerequisites: -You know how dm-crypt works. If not, visit the following web page: -http://www.saout.de/misc/dm-crypt/ -You have read Documentation/power/swsusp.rst and understand it. -You did read Documentation/filesystems/ramfs-rootfs-initramfs.rst and know= how an initrd works. -You know how to create or how to modify an initrd. - -Now your system is properly set up, your disk is encrypted except for -the swap device(s) and the boot partition which may contain a mini -system for crypto setup and/or rescue purposes. You may even have -an initrd that does your current crypto setup already. - -At this point you want to encrypt your swap, too. Still you want to -be able to suspend using swsusp. This, however, means that you -have to be able to either enter a passphrase or that you read -the key(s) from an external device like a pcmcia flash disk -or an usb stick prior to resume. So you need an initrd, that sets -up dm-crypt and then asks swsusp to resume from the encrypted -swap device. - -The most important thing is that you set up dm-crypt in such -a way that the swap device you suspend to/resume from has -always the same major/minor within the initrd as well as -within your running system. The easiest way to achieve this is -to always set up this swap device first with dmsetup, so that -it will always look like the following:: - - brw------- 1 root root 254, 0 Jul 28 13:37 /dev/mapper/swap0 - -Now set up your kernel to use /dev/mapper/swap0 as the default -resume partition, so your kernel .config contains:: - - CONFIG_PM_STD_PARTITION=3D"/dev/mapper/swap0" - -Prepare your boot loader to use the initrd you will create or -modify. For lilo the simplest setup looks like the following -lines:: - - image=3D/boot/vmlinuz - initrd=3D/boot/initrd.gz - label=3Dlinux - append=3D"root=3D/dev/ram0 init=3D/linuxrc rw" - -Finally you need to create or modify your initrd. Lets assume -you create an initrd that reads the required dm-crypt setup -from a pcmcia flash disk card. The card is formatted with an ext2 -fs which resides on /dev/hde1 when the card is inserted. The -card contains at least the encrypted swap setup in a file -named "swapkey". /etc/fstab of your initrd contains something -like the following:: - - /dev/hda1 /mnt ext3 ro 0 0 - none /proc proc defaults,noatime,nodiratime 0 0 - none /sys sysfs defaults,noatime,nodiratime 0 0 - -/dev/hda1 contains an unencrypted mini system that sets up all -of your crypto devices, again by reading the setup from the -pcmcia flash disk. What follows now is a /linuxrc for your -initrd that allows you to resume from encrypted swap and that -continues boot with your mini system on /dev/hda1 if resume -does not happen:: - - #!/bin/sh - PATH=3D/sbin:/bin:/usr/sbin:/usr/bin - mount /proc - mount /sys - mapped=3D0 - noresume=3D`grep -c noresume /proc/cmdline` - if [ "$*" !=3D "" ] - then - noresume=3D1 - fi - dmesg -n 1 - /sbin/cardmgr -q - for i in 1 2 3 4 5 6 7 8 9 0 - do - if [ -f /proc/ide/hde/media ] - then - usleep 500000 - mount -t ext2 -o ro /dev/hde1 /mnt - if [ -f /mnt/swapkey ] - then - dmsetup create swap0 /mnt/swapkey > /dev/null 2>&1 && mapped=3D1 - fi - umount /mnt - break - fi - usleep 500000 - done - killproc /sbin/cardmgr - dmesg -n 6 - if [ $mapped =3D 1 ] - then - if [ $noresume !=3D 0 ] - then - mkswap /dev/mapper/swap0 > /dev/null 2>&1 - fi - echo 254:0 > /sys/power/resume - dmsetup remove swap0 - fi - umount /sys - mount /mnt - umount /proc - cd /mnt - pivot_root . mnt - mount /proc - umount -l /mnt - umount /proc - exec chroot . /sbin/init $* < dev/console > dev/console 2>&1 - -Please don't mind the weird loop above, busybox's msh doesn't know -the let statement. Now, what is happening in the script? -First we have to decide if we want to try to resume, or not. -We will not resume if booting with "noresume" or any parameters -for init like "single" or "emergency" as boot parameters. - -Then we need to set up dmcrypt with the setup data from the -pcmcia flash disk. If this succeeds we need to reset the swap -device if we don't want to resume. The line "echo 254:0 > /sys/power/resum= e" -then attempts to resume from the first device mapper device. -Note that it is important to set the device in /sys/power/resume, -regardless if resuming or not, otherwise later suspend will fail. -If resume starts, script execution terminates here. - -Otherwise we just remove the encrypted swap device and leave it to the -mini system on /dev/hda1 to set the whole crypto up (it is up to -you to modify this to your taste). - -What then follows is the well known process to change the root -file system and continue booting from there. I prefer to unmount -the initrd prior to continue booting but it is up to you to modify -this. diff --git a/Documentation/translations/zh_CN/power/index.rst b/Documentati= on/translations/zh_CN/power/index.rst index bc54983ba515..4ee880e65107 100644 --- a/Documentation/translations/zh_CN/power/index.rst +++ b/Documentation/translations/zh_CN/power/index.rst @@ -32,7 +32,6 @@ TODOList: * suspend-and-cpuhotplug * suspend-and-interrupts * swsusp-and-swap-files - * swsusp-dmcrypt * swsusp * video * tricks --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (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 B35F615B971 for ; Sat, 13 Sep 2025 01:02:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725382; cv=none; b=WO4HuLbS5Sj55qEzxbONxz41ghEBd1c+DmUsd26Pw+h64HhbOoSyz/gMs+eAani40FQUg5HmiwwBQ5hc2Km8yX7soByZW+ndCfuFAEOJihSSLWXp6lmOztDAX/SjZUpK1B40v7vRC1d2f4Oy3utEKVRSehuHD7GYNL1bXc3beCE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725382; c=relaxed/simple; bh=7gEBevABKdbz1juiJdjHLSN5JkwW9ymo+YvMgIW9ipA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LIesmMK7XC8hPWS3fUUhrpyqZwb0OKw9Wec43LSB6LBzuWU5KhIZcjBxxDIqWEMz0OotZwi4jn91lIdsSUMrnsMPdDDBFIWIT5yiXpcgl06b5oNkNoRS+3asdTb2zLuYkLekSnyfwi0NnkRW0z3vcMV1UFwEmc0kZs+UhCk49ro= 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=O0ScNvh0; arc=none smtp.client-ip=209.85.218.49 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="O0ScNvh0" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-b0428b537e5so362979566b.3 for ; Fri, 12 Sep 2025 18:02:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757725377; x=1758330177; 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=NF+T8e2PbYTcD1qVfLaQWGAohazGGctTG5y1SpryEQ8=; b=O0ScNvh0+cP6sT7JkadhC/QXUmObIpeSbY2fQIt03J010Zza+G4JFOaEZbHAvekfGB mco47PM/GT3Sfnxa0RfYloaWzE6GYSzMYtnBGhsNoukAn3wC0hea1bA1PoO/cC3YKdiL 09mish++j5JwzrPRxkoWUWgnxDwtmM3yK8gib+NRuTdriA0pjp1JdH0lMCRZQVCI2cG+ bYeDUTsagYkXm6qdmBztzg2jyFy1VW28x/aVivC8k/jcaEW/pxLhDXt5EEjoCx257EkS ULhalASsUHhwBiBGb+9Txqlg0Z5wWYVXtyFXMCP7OnumslAHH2smyAPbboz9wvtbaVK9 tTKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757725377; x=1758330177; 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=NF+T8e2PbYTcD1qVfLaQWGAohazGGctTG5y1SpryEQ8=; b=EA5PVLUlmSugxHu5CkhbEBnsCEp3MgoR11EkA3cP7pIamGhaPZuZip53SKqfr9PEDB XUQDXS5dT4kYr8QSnjK9CZSB8SEodPQcoBlujzvVzKoOA1t0t8ExQoJtzPLt7uFUZwvv tWX8d/M8xe+zB66Sp+kqe++INIvb5EmRsACRCGhvdBPLpLT+yvub998pf5VE3ekelsen WAJotymikDDelPuPGUWmKkr+Z8+DILLYsFGw71kCwJJ8hSNZUmviBs9BgiSjFtS0sM/+ oRAt2zw5MdiDhWJm1T3onLddbZe/4apxcEZgERGmBayAkmmj49r9xyTBppV3UG+xxWgX 2jHg== X-Forwarded-Encrypted: i=1; AJvYcCVVdF16PE4xUXxJI7gopeaFLPocTKWmdYjjElEEYIrgZBQM6a5LZ6y2j7J8RgEVGTtGvu6vqnVBkF1Vy9E=@vger.kernel.org X-Gm-Message-State: AOJu0YxAtDRrIjUmPNqGHAy7N83Big+zLRgAZqm41u3rwTfzUFx+jDAX uRcNWF/HiEJEwmmgwznvcDzw3m/uFX0WuAWl0HtJnVMG4PY4hp8ddHOM X-Gm-Gg: ASbGnctuHGuyBgI5eeP32fBvfRkqOlRvFlCbBoKCUZJzzor0iXXXInlQRs9nGJfGORu lRLLGJ/vNWm1PtPcGhCcu78kZ9yDh4DBuDIAhcxsT7TfmmwrJAi+uLnkd1SxJqZKsqxqvszDZ4e RGOLalXWizFO3hL5YLwl0bcD4EbZsfyayy/yqrGA7KPk3TlUPHN+o6vzOjKrabsk0Bq4YqGL0zv DSgUEg0FRt1pvAM8VMxWJ2SZScF5gLqQkdtaSdXYkVJfldzlFfzQuu5OkajP8iqUiH6jNA3RyYy 12b1I4yRd7kJtVBK9Ie0BjI2ETBxj/eOfYo8Ebt2OmvJ6wVNem+e8WYus828E8o/dbcoAJzhqhM GFlojYf/84zOm6r54ScNc6Lh6FiyYQ9kljofeEqKO X-Google-Smtp-Source: AGHT+IFAenQpr+eqgUw7A0V0nlBuRy0elv8T6Skb87OgHRBdD5XZP8Q5CVFdy6An9tI7tJa4OQ9j+A== X-Received: by 2002:a17:907:d19:b0:b07:88d0:b with SMTP id a640c23a62f3a-b07c3acc5c1mr462636966b.63.1757725376510; Fri, 12 Sep 2025 18:02:56 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b3128525sm468738866b.31.2025.09.12.18.02.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 18:02:56 -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 21/62] init: remove all mentions of root=/dev/ram* Date: Sat, 13 Sep 2025 00:38:00 +0000 Message-ID: <20250913003842.41944-22-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Initrd support is removed, so root=3D/dev/ram* is never correct Signed-off-by: Askar Safin --- Documentation/admin-guide/kernel-parameters.txt | 3 +-- Documentation/arch/m68k/kernel-options.rst | 9 ++------- arch/arm/boot/dts/arm/integratorap.dts | 2 +- arch/arm/boot/dts/arm/integratorcp.dts | 2 +- arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-cmm.dts | 2 +- .../boot/dts/aspeed/aspeed-bmc-facebook-galaxy100.dts | 2 +- .../arm/boot/dts/aspeed/aspeed-bmc-facebook-minipack.dts | 2 +- .../arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge100.dts | 2 +- arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge40.dts | 2 +- arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yamp.dts | 2 +- .../boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi | 2 +- arch/arm/boot/dts/hisilicon/hi3620-hi4511.dts | 2 +- .../boot/dts/intel/ixp/intel-ixp42x-welltech-epbx100.dts | 2 +- arch/arm/boot/dts/nspire/nspire-classic.dtsi | 2 +- arch/arm/boot/dts/nspire/nspire-cx.dts | 2 +- arch/arm/boot/dts/samsung/exynos4210-origen.dts | 2 +- arch/arm/boot/dts/samsung/exynos4210-smdkv310.dts | 2 +- arch/arm/boot/dts/samsung/exynos4412-smdk4412.dts | 2 +- arch/arm/boot/dts/samsung/exynos5250-smdk5250.dts | 2 +- arch/arm/boot/dts/st/ste-nomadik-nhk15.dts | 2 +- arch/arm/boot/dts/st/ste-nomadik-s8815.dts | 2 +- arch/arm/boot/dts/st/stm32429i-eval.dts | 2 +- arch/arm/boot/dts/st/stm32746g-eval.dts | 2 +- arch/arm/boot/dts/st/stm32f429-disco.dts | 2 +- arch/arm/boot/dts/st/stm32f469-disco.dts | 2 +- arch/arm/boot/dts/st/stm32f746-disco.dts | 2 +- arch/arm/boot/dts/st/stm32f769-disco.dts | 2 +- arch/arm/boot/dts/st/stm32h743i-disco.dts | 2 +- arch/arm/boot/dts/st/stm32h743i-eval.dts | 2 +- arch/arm/boot/dts/st/stm32h747i-disco.dts | 2 +- arch/arm/boot/dts/st/stm32h750i-art-pi.dts | 2 +- arch/arm/configs/assabet_defconfig | 2 +- arch/arm/configs/at91_dt_defconfig | 2 +- arch/arm/configs/exynos_defconfig | 2 +- arch/arm/configs/lpc32xx_defconfig | 2 +- arch/arm/configs/pxa_defconfig | 2 +- arch/arm/configs/s3c6400_defconfig | 2 +- arch/arm/configs/s5pv210_defconfig | 2 +- arch/arm/configs/sama5_defconfig | 2 +- arch/arm/configs/u8500_defconfig | 2 +- arch/parisc/defpalo.conf | 2 +- arch/s390/boot/ipl_parm.c | 2 +- arch/xtensa/Kconfig | 2 +- arch/xtensa/boot/dts/csp.dts | 2 +- 44 files changed, 45 insertions(+), 51 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentatio= n/admin-guide/kernel-parameters.txt index e862a7b1d2ec..a259f2bdba0f 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -6407,8 +6407,7 @@ Usually this is a block device specifier of some kind, see the early_lookup_bdev comment in block/early-lookup.c for details. - Alternatively this can be "ram" for the legacy initial - ramdisk, "nfs" and "cifs" for root on a network file + Alternatively this can be "nfs" and "cifs" for root on a network file system, or "mtd" and "ubi" for mounting from raw flash. =20 rootdelay=3D [KNL] Delay (in seconds) to pause before attempting to diff --git a/Documentation/arch/m68k/kernel-options.rst b/Documentation/arc= h/m68k/kernel-options.rst index f6469ebeb2c7..a508ee8efa8b 100644 --- a/Documentation/arch/m68k/kernel-options.rst +++ b/Documentation/arch/m68k/kernel-options.rst @@ -73,7 +73,6 @@ hardcoded name to number mappings. The name must always b= e a combination of two or three letters, followed by a decimal number. Valid names are:: =20 - /dev/ram: -> 0x0100 (initial ramdisk) /dev/hda: -> 0x0300 (first IDE disk) /dev/hdb: -> 0x0340 (second IDE disk) /dev/sda: -> 0x0800 (first SCSI disk) @@ -86,12 +85,8 @@ Valid names are:: The name must be followed by a decimal number, that stands for the partition number. Internally, the value of the number is just added to the device number mentioned in the table above. The -exceptions are /dev/ram and /dev/fd, where /dev/ram refers to an -initial ramdisk loaded by your bootstrap program (please consult the -instructions for your bootstrap program to find out how to load an -initial ramdisk). As of kernel version 2.0.18 you must specify -/dev/ram as the root device if you want to boot from an initial -ramdisk. For the floppy devices, /dev/fd, the number stands for the +exception is /dev/fd. +For the floppy devices, /dev/fd, the number stands for the floppy drive number (there are no partitions on floppy disks). I.e., /dev/fd0 stands for the first drive, /dev/fd1 for the second, and so on. Since the number is just added, you can also force the disk format diff --git a/arch/arm/boot/dts/arm/integratorap.dts b/arch/arm/boot/dts/arm= /integratorap.dts index 9b6a1dbaf265..2e43a8291d40 100644 --- a/arch/arm/boot/dts/arm/integratorap.dts +++ b/arch/arm/boot/dts/arm/integratorap.dts @@ -53,7 +53,7 @@ aliases { }; =20 chosen { - bootargs =3D "root=3D/dev/ram0 console=3DttyAM0,38400n8 earlyprintk"; + bootargs =3D "console=3DttyAM0,38400n8 earlyprintk"; }; =20 /* 24 MHz chrystal on the Integrator/AP development board */ diff --git a/arch/arm/boot/dts/arm/integratorcp.dts b/arch/arm/boot/dts/arm= /integratorcp.dts index 8ad1a8957ace..2ac140741752 100644 --- a/arch/arm/boot/dts/arm/integratorcp.dts +++ b/arch/arm/boot/dts/arm/integratorcp.dts @@ -11,7 +11,7 @@ / { compatible =3D "arm,integrator-cp"; =20 chosen { - bootargs =3D "root=3D/dev/ram0 console=3DttyAMA0,38400n8 earlyprintk"; + bootargs =3D "console=3DttyAMA0,38400n8 earlyprintk"; }; =20 cpus { diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-cmm.dts b/arch/ar= m/boot/dts/aspeed/aspeed-bmc-facebook-cmm.dts index 24153868cc00..f4ae167e89f0 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-cmm.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-cmm.dts @@ -280,7 +280,7 @@ aliases { =20 chosen { stdout-path =3D &uart1; - bootargs =3D "console=3DttyS1,9600n8 root=3D/dev/ram rw earlycon"; + bootargs =3D "console=3DttyS1,9600n8 rw earlycon"; }; =20 ast-adc-hwmon { diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-galaxy100.dts b/a= rch/arm/boot/dts/aspeed/aspeed-bmc-facebook-galaxy100.dts index 60e875ac2461..d51ee3aaa461 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-galaxy100.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-galaxy100.dts @@ -10,7 +10,7 @@ / { =20 chosen { stdout-path =3D &uart5; - bootargs =3D "console=3DttyS0,9600n8 root=3D/dev/ram rw"; + bootargs =3D "console=3DttyS0,9600n8 rw"; }; =20 ast-adc-hwmon { diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minipack.dts b/ar= ch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minipack.dts index aafd1042b6e5..4233d0d857b8 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minipack.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minipack.dts @@ -230,7 +230,7 @@ aliases { =20 chosen { stdout-path =3D &uart1; - bootargs =3D "debug console=3DttyS1,9600n8 root=3D/dev/ram rw"; + bootargs =3D "debug console=3DttyS1,9600n8 rw"; }; }; =20 diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge100.dts b/ar= ch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge100.dts index 97cd11c3d9a5..23f9d1c690f8 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge100.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge100.dts @@ -10,7 +10,7 @@ / { =20 chosen { stdout-path =3D &uart3; - bootargs =3D "console=3DttyS2,9600n8 root=3D/dev/ram rw"; + bootargs =3D "console=3DttyS2,9600n8 rw"; }; =20 ast-adc-hwmon { diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge40.dts b/arc= h/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge40.dts index 6624855d8ebd..e9b1b51f9f7a 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge40.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge40.dts @@ -10,7 +10,7 @@ / { =20 chosen { stdout-path =3D &uart3; - bootargs =3D "console=3DttyS2,9600n8 root=3D/dev/ram rw"; + bootargs =3D "console=3DttyS2,9600n8 rw"; }; =20 ast-adc-hwmon { diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yamp.dts b/arch/a= rm/boot/dts/aspeed/aspeed-bmc-facebook-yamp.dts index 98fe0d6c8188..578ca0dc9647 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yamp.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yamp.dts @@ -21,7 +21,7 @@ aliases { =20 chosen { stdout-path =3D &uart5; - bootargs =3D "console=3DttyS0,9600n8 root=3D/dev/ram rw"; + bootargs =3D "console=3DttyS0,9600n8 rw"; }; }; =20 diff --git a/arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi b= /arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi index 00e5887c926f..3dbf0cc70f48 100644 --- a/arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi +++ b/arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi @@ -12,7 +12,7 @@ aliases { }; =20 chosen { - bootargs =3D "console=3DttyS0,9600n8 root=3D/dev/ram rw vmalloc=3D640M"; + bootargs =3D "console=3DttyS0,9600n8 rw vmalloc=3D640M"; }; =20 memory@80000000 { diff --git a/arch/arm/boot/dts/hisilicon/hi3620-hi4511.dts b/arch/arm/boot/= dts/hisilicon/hi3620-hi4511.dts index f1c816a1d7cf..bbd62c6ad280 100644 --- a/arch/arm/boot/dts/hisilicon/hi3620-hi4511.dts +++ b/arch/arm/boot/dts/hisilicon/hi3620-hi4511.dts @@ -13,7 +13,7 @@ / { compatible =3D "hisilicon,hi3620-hi4511"; =20 chosen { - bootargs =3D "root=3D/dev/ram0"; + bootargs =3D ""; stdout-path =3D "serial0:115200n8"; }; =20 diff --git a/arch/arm/boot/dts/intel/ixp/intel-ixp42x-welltech-epbx100.dts = b/arch/arm/boot/dts/intel/ixp/intel-ixp42x-welltech-epbx100.dts index c550c421b659..96105137a364 100644 --- a/arch/arm/boot/dts/intel/ixp/intel-ixp42x-welltech-epbx100.dts +++ b/arch/arm/boot/dts/intel/ixp/intel-ixp42x-welltech-epbx100.dts @@ -20,7 +20,7 @@ memory@0 { }; =20 chosen { - bootargs =3D "console=3DttyS0,115200n8 root=3D/dev/ram0 initrd=3D0x00800= 000,9M"; + bootargs =3D "console=3DttyS0,115200n8 initrd=3D0x00800000,9M"; stdout-path =3D "uart0:115200n8"; }; =20 diff --git a/arch/arm/boot/dts/nspire/nspire-classic.dtsi b/arch/arm/boot/d= ts/nspire/nspire-classic.dtsi index 0ee53d3ecd54..224cf5921e26 100644 --- a/arch/arm/boot/dts/nspire/nspire-classic.dtsi +++ b/arch/arm/boot/dts/nspire/nspire-classic.dtsi @@ -81,6 +81,6 @@ panel_in: endpoint { }; }; chosen { - bootargs =3D "debug earlyprintk console=3Dtty0 console=3DttyS0,115200n8 = root=3D/dev/ram0"; + bootargs =3D "debug earlyprintk console=3Dtty0 console=3DttyS0,115200n8"; }; }; diff --git a/arch/arm/boot/dts/nspire/nspire-cx.dts b/arch/arm/boot/dts/nsp= ire/nspire-cx.dts index debeff0ec010..08155d15cca9 100644 --- a/arch/arm/boot/dts/nspire/nspire-cx.dts +++ b/arch/arm/boot/dts/nspire/nspire-cx.dts @@ -165,6 +165,6 @@ panel_in: endpoint { }; }; chosen { - bootargs =3D "debug earlyprintk console=3Dtty0 console=3DttyAMA0,115200n= 8 root=3D/dev/ram0"; + bootargs =3D "debug earlyprintk console=3Dtty0 console=3DttyAMA0,115200n= 8"; }; }; diff --git a/arch/arm/boot/dts/samsung/exynos4210-origen.dts b/arch/arm/boo= t/dts/samsung/exynos4210-origen.dts index 4dcf794bd18b..b714073143e7 100644 --- a/arch/arm/boot/dts/samsung/exynos4210-origen.dts +++ b/arch/arm/boot/dts/samsung/exynos4210-origen.dts @@ -36,7 +36,7 @@ aliases { }; =20 chosen { - bootargs =3D "root=3D/dev/ram0 rw initrd=3D0x41000000,8M init=3D/linuxrc= "; + bootargs =3D "rw initrd=3D0x41000000,8M init=3D/linuxrc"; stdout-path =3D "serial2:115200n8"; }; =20 diff --git a/arch/arm/boot/dts/samsung/exynos4210-smdkv310.dts b/arch/arm/b= oot/dts/samsung/exynos4210-smdkv310.dts index 4cdeddeff3fc..2a3c2a4c0e90 100644 --- a/arch/arm/boot/dts/samsung/exynos4210-smdkv310.dts +++ b/arch/arm/boot/dts/samsung/exynos4210-smdkv310.dts @@ -30,7 +30,7 @@ aliases { }; =20 chosen { - bootargs =3D "root=3D/dev/ram0 rw initrd=3D0x41000000,8M init=3D/linuxrc= "; + bootargs =3D "rw initrd=3D0x41000000,8M init=3D/linuxrc"; stdout-path =3D "serial1:115200n8"; }; =20 diff --git a/arch/arm/boot/dts/samsung/exynos4412-smdk4412.dts b/arch/arm/b= oot/dts/samsung/exynos4412-smdk4412.dts index 4b18cc55d6ca..920af4f91c75 100644 --- a/arch/arm/boot/dts/samsung/exynos4412-smdk4412.dts +++ b/arch/arm/boot/dts/samsung/exynos4412-smdk4412.dts @@ -27,7 +27,7 @@ aliases { }; =20 chosen { - bootargs =3D "root=3D/dev/ram0 rw initrd=3D0x41000000,8M init=3D/linuxrc= "; + bootargs =3D "rw initrd=3D0x41000000,8M init=3D/linuxrc"; stdout-path =3D "serial1:115200n8"; }; =20 diff --git a/arch/arm/boot/dts/samsung/exynos5250-smdk5250.dts b/arch/arm/b= oot/dts/samsung/exynos5250-smdk5250.dts index 4164c7c2a3eb..e5cfff1ffad0 100644 --- a/arch/arm/boot/dts/samsung/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/samsung/exynos5250-smdk5250.dts @@ -27,7 +27,7 @@ memory@40000000 { }; =20 chosen { - bootargs =3D "root=3D/dev/ram0 rw initrd=3D0x41000000,8M init=3D/linuxrc= "; + bootargs =3D "rw initrd=3D0x41000000,8M init=3D/linuxrc"; stdout-path =3D "serial2:115200n8"; }; =20 diff --git a/arch/arm/boot/dts/st/ste-nomadik-nhk15.dts b/arch/arm/boot/dts= /st/ste-nomadik-nhk15.dts index cdff33063d6f..8a22425cdb78 100644 --- a/arch/arm/boot/dts/st/ste-nomadik-nhk15.dts +++ b/arch/arm/boot/dts/st/ste-nomadik-nhk15.dts @@ -13,7 +13,7 @@ / { compatible =3D "st,nomadik-nhk-15"; =20 chosen { - bootargs =3D "root=3D/dev/ram0 console=3DttyAMA1,115200n8 earlyprintk"; + bootargs =3D "console=3DttyAMA1,115200n8 earlyprintk"; }; =20 aliases { diff --git a/arch/arm/boot/dts/st/ste-nomadik-s8815.dts b/arch/arm/boot/dts= /st/ste-nomadik-s8815.dts index c905c2643a12..7f418d8a2370 100644 --- a/arch/arm/boot/dts/st/ste-nomadik-s8815.dts +++ b/arch/arm/boot/dts/st/ste-nomadik-s8815.dts @@ -13,7 +13,7 @@ / { compatible =3D "calaosystems,usb-s8815"; =20 chosen { - bootargs =3D "root=3D/dev/ram0 console=3DttyAMA1,115200n8 earlyprintk"; + bootargs =3D "console=3DttyAMA1,115200n8 earlyprintk"; }; =20 aliases { diff --git a/arch/arm/boot/dts/st/stm32429i-eval.dts b/arch/arm/boot/dts/st= /stm32429i-eval.dts index afa417b34b25..7e8834af20c6 100644 --- a/arch/arm/boot/dts/st/stm32429i-eval.dts +++ b/arch/arm/boot/dts/st/stm32429i-eval.dts @@ -57,7 +57,7 @@ / { compatible =3D "st,stm32429i-eval", "st,stm32f429"; =20 chosen { - bootargs =3D "root=3D/dev/ram"; + bootargs =3D ""; stdout-path =3D "serial0:115200n8"; }; =20 diff --git a/arch/arm/boot/dts/st/stm32746g-eval.dts b/arch/arm/boot/dts/st= /stm32746g-eval.dts index e9ac37b6eca0..43a52b26fdaa 100644 --- a/arch/arm/boot/dts/st/stm32746g-eval.dts +++ b/arch/arm/boot/dts/st/stm32746g-eval.dts @@ -51,7 +51,7 @@ / { compatible =3D "st,stm32746g-eval", "st,stm32f746"; =20 chosen { - bootargs =3D "root=3D/dev/ram"; + bootargs =3D ""; stdout-path =3D "serial0:115200n8"; }; =20 diff --git a/arch/arm/boot/dts/st/stm32f429-disco.dts b/arch/arm/boot/dts/s= t/stm32f429-disco.dts index a3cb4aabdd5a..68d822d79988 100644 --- a/arch/arm/boot/dts/st/stm32f429-disco.dts +++ b/arch/arm/boot/dts/st/stm32f429-disco.dts @@ -57,7 +57,7 @@ / { compatible =3D "st,stm32f429i-disco", "st,stm32f429"; =20 chosen { - bootargs =3D "root=3D/dev/ram"; + bootargs =3D ""; stdout-path =3D "serial0:115200n8"; }; =20 diff --git a/arch/arm/boot/dts/st/stm32f469-disco.dts b/arch/arm/boot/dts/s= t/stm32f469-disco.dts index 8a4f8ddd083d..31b4abbc608d 100644 --- a/arch/arm/boot/dts/st/stm32f469-disco.dts +++ b/arch/arm/boot/dts/st/stm32f469-disco.dts @@ -56,7 +56,7 @@ / { compatible =3D "st,stm32f469i-disco", "st,stm32f469"; =20 chosen { - bootargs =3D "root=3D/dev/ram"; + bootargs =3D ""; stdout-path =3D "serial0:115200n8"; }; =20 diff --git a/arch/arm/boot/dts/st/stm32f746-disco.dts b/arch/arm/boot/dts/s= t/stm32f746-disco.dts index b57dbdce2f40..3cb04547228e 100644 --- a/arch/arm/boot/dts/st/stm32f746-disco.dts +++ b/arch/arm/boot/dts/st/stm32f746-disco.dts @@ -52,7 +52,7 @@ / { compatible =3D "st,stm32f746-disco", "st,stm32f746"; =20 chosen { - bootargs =3D "root=3D/dev/ram"; + bootargs =3D ""; stdout-path =3D "serial0:115200n8"; }; =20 diff --git a/arch/arm/boot/dts/st/stm32f769-disco.dts b/arch/arm/boot/dts/s= t/stm32f769-disco.dts index 535cfdc4681c..13f96ee0b3de 100644 --- a/arch/arm/boot/dts/st/stm32f769-disco.dts +++ b/arch/arm/boot/dts/st/stm32f769-disco.dts @@ -51,7 +51,7 @@ / { compatible =3D "st,stm32f769-disco", "st,stm32f769"; =20 chosen { - bootargs =3D "root=3D/dev/ram"; + bootargs =3D ""; stdout-path =3D "serial0:115200n8"; }; =20 diff --git a/arch/arm/boot/dts/st/stm32h743i-disco.dts b/arch/arm/boot/dts/= st/stm32h743i-disco.dts index 8451a54a9a08..8bdb24fcf0c7 100644 --- a/arch/arm/boot/dts/st/stm32h743i-disco.dts +++ b/arch/arm/boot/dts/st/stm32h743i-disco.dts @@ -49,7 +49,7 @@ / { compatible =3D "st,stm32h743i-disco", "st,stm32h743"; =20 chosen { - bootargs =3D "root=3D/dev/ram"; + bootargs =3D ""; stdout-path =3D "serial0:115200n8"; }; =20 diff --git a/arch/arm/boot/dts/st/stm32h743i-eval.dts b/arch/arm/boot/dts/s= t/stm32h743i-eval.dts index 4b0ced27b80e..c3de36d94acf 100644 --- a/arch/arm/boot/dts/st/stm32h743i-eval.dts +++ b/arch/arm/boot/dts/st/stm32h743i-eval.dts @@ -49,7 +49,7 @@ / { compatible =3D "st,stm32h743i-eval", "st,stm32h743"; =20 chosen { - bootargs =3D "root=3D/dev/ram"; + bootargs =3D ""; stdout-path =3D "serial0:115200n8"; }; =20 diff --git a/arch/arm/boot/dts/st/stm32h747i-disco.dts b/arch/arm/boot/dts/= st/stm32h747i-disco.dts index 99f0255dae8e..a57341e2d95c 100644 --- a/arch/arm/boot/dts/st/stm32h747i-disco.dts +++ b/arch/arm/boot/dts/st/stm32h747i-disco.dts @@ -14,7 +14,7 @@ / { compatible =3D "st,stm32h747i-disco", "st,stm32h747"; =20 chosen { - bootargs =3D "root=3D/dev/ram"; + bootargs =3D ""; stdout-path =3D "serial0:115200n8"; }; =20 diff --git a/arch/arm/boot/dts/st/stm32h750i-art-pi.dts b/arch/arm/boot/dts= /st/stm32h750i-art-pi.dts index 56c53e262da7..b4bd8315464c 100644 --- a/arch/arm/boot/dts/st/stm32h750i-art-pi.dts +++ b/arch/arm/boot/dts/st/stm32h750i-art-pi.dts @@ -54,7 +54,7 @@ / { compatible =3D "st,stm32h750i-art-pi", "st,stm32h750"; =20 chosen { - bootargs =3D "root=3D/dev/ram"; + bootargs =3D ""; stdout-path =3D "serial0:2000000n8"; }; =20 diff --git a/arch/arm/configs/assabet_defconfig b/arch/arm/configs/assabet_= defconfig index 07ab9eaac4af..56fce6c08945 100644 --- a/arch/arm/configs/assabet_defconfig +++ b/arch/arm/configs/assabet_defconfig @@ -5,7 +5,7 @@ CONFIG_ARCH_MULTI_V4=3Dy # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_SA1100=3Dy CONFIG_SA1100_ASSABET=3Dy -CONFIG_CMDLINE=3D"mem=3D32M console=3DttySA0,38400n8 initrd=3D0xc0800000,3= M root=3D/dev/ram" +CONFIG_CMDLINE=3D"mem=3D32M console=3DttySA0,38400n8 initrd=3D0xc0800000,3= M" CONFIG_FPE_NWFPE=3Dy CONFIG_PM=3Dy CONFIG_MODULES=3Dy diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_= defconfig index ff13e1ecf4bb..b53c7906d317 100644 --- a/arch/arm/configs/at91_dt_defconfig +++ b/arch/arm/configs/at91_dt_defconfig @@ -23,7 +23,7 @@ CONFIG_UACCESS_WITH_MEMCPY=3Dy # CONFIG_ATAGS is not set CONFIG_ARM_APPENDED_DTB=3Dy CONFIG_ARM_ATAG_DTB_COMPAT=3Dy -CONFIG_CMDLINE=3D"console=3DttyS0,115200 initrd=3D0x21100000,25165824 root= =3D/dev/ram0 rw" +CONFIG_CMDLINE=3D"console=3DttyS0,115200 initrd=3D0x21100000,25165824 rw" CONFIG_MODULES=3Dy CONFIG_MODULE_UNLOAD=3Dy # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_de= fconfig index 77d3521f55d4..02a903816baa 100644 --- a/arch/arm/configs/exynos_defconfig +++ b/arch/arm/configs/exynos_defconfig @@ -15,7 +15,7 @@ CONFIG_HIGHMEM=3Dy CONFIG_SECCOMP=3Dy CONFIG_ARM_APPENDED_DTB=3Dy CONFIG_ARM_ATAG_DTB_COMPAT=3Dy -CONFIG_CMDLINE=3D"root=3D/dev/ram0 rw initrd=3D0x41000000,8M console=3Dtty= SAC1,115200 init=3D/linuxrc mem=3D256M" +CONFIG_CMDLINE=3D"rw initrd=3D0x41000000,8M console=3DttySAC1,115200 init= =3D/linuxrc mem=3D256M" CONFIG_CPU_FREQ=3Dy CONFIG_CPU_FREQ_STAT=3Dy CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=3Dy diff --git a/arch/arm/configs/lpc32xx_defconfig b/arch/arm/configs/lpc32xx_= defconfig index 9afccd76446b..a98d1125b9aa 100644 --- a/arch/arm/configs/lpc32xx_defconfig +++ b/arch/arm/configs/lpc32xx_defconfig @@ -13,7 +13,7 @@ CONFIG_ARCH_LPC32XX=3Dy CONFIG_AEABI=3Dy CONFIG_ARM_APPENDED_DTB=3Dy CONFIG_ARM_ATAG_DTB_COMPAT=3Dy -CONFIG_CMDLINE=3D"console=3DttyS0,115200n81 root=3D/dev/ram0" +CONFIG_CMDLINE=3D"console=3DttyS0,115200n81" CONFIG_CPU_IDLE=3Dy CONFIG_VFP=3Dy CONFIG_JUMP_LABEL=3Dy diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig index 1a80602c1284..0c4b9389d4d6 100644 --- a/arch/arm/configs/pxa_defconfig +++ b/arch/arm/configs/pxa_defconfig @@ -22,7 +22,7 @@ CONFIG_MACH_AKITA=3Dy CONFIG_MACH_BORZOI=3Dy CONFIG_AEABI=3Dy CONFIG_ARCH_FORCE_MAX_ORDER=3D8 -CONFIG_CMDLINE=3D"root=3D/dev/ram0 ro" +CONFIG_CMDLINE=3D"ro" CONFIG_CPU_FREQ=3Dy CONFIG_CPU_FREQ_STAT=3Dy CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=3Dy diff --git a/arch/arm/configs/s3c6400_defconfig b/arch/arm/configs/s3c6400_= defconfig index 23635d5b9322..a5018ce274ec 100644 --- a/arch/arm/configs/s3c6400_defconfig +++ b/arch/arm/configs/s3c6400_defconfig @@ -4,7 +4,7 @@ CONFIG_ARCH_MULTI_V6=3Dy # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_S3C64XX=3Dy CONFIG_MACH_WLF_CRAGG_6410=3Dy -CONFIG_CMDLINE=3D"console=3DttySAC0,115200 root=3D/dev/ram init=3D/linuxrc= initrd=3D0x51000000,6M" +CONFIG_CMDLINE=3D"console=3DttySAC0,115200 init=3D/linuxrc initrd=3D0x5100= 0000,6M" CONFIG_VFP=3Dy CONFIG_MODULES=3Dy CONFIG_MODULE_UNLOAD=3Dy diff --git a/arch/arm/configs/s5pv210_defconfig b/arch/arm/configs/s5pv210_= defconfig index 8ec82d9b51e4..485dd5174c62 100644 --- a/arch/arm/configs/s5pv210_defconfig +++ b/arch/arm/configs/s5pv210_defconfig @@ -8,7 +8,7 @@ CONFIG_KALLSYMS_ALL=3Dy CONFIG_ARCH_S5PV210=3Dy CONFIG_VMSPLIT_2G=3Dy CONFIG_ARM_APPENDED_DTB=3Dy -CONFIG_CMDLINE=3D"root=3D/dev/ram0 rw initrd=3D0x20800000,8M console=3Dtty= SAC1,115200 init=3D/linuxrc" +CONFIG_CMDLINE=3D"rw initrd=3D0x20800000,8M console=3DttySAC1,115200 init= =3D/linuxrc" CONFIG_CPU_FREQ=3Dy CONFIG_CPU_FREQ_STAT=3Dy CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=3Dy diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defc= onfig index 2cad045e1d8d..0463ff84c06c 100644 --- a/arch/arm/configs/sama5_defconfig +++ b/arch/arm/configs/sama5_defconfig @@ -14,7 +14,7 @@ CONFIG_SOC_SAMA5D4=3Dy # CONFIG_ATMEL_CLOCKSOURCE_PIT is not set CONFIG_UACCESS_WITH_MEMCPY=3Dy # CONFIG_ATAGS is not set -CONFIG_CMDLINE=3D"console=3DttyS0,115200 initrd=3D0x21100000,25165824 root= =3D/dev/ram0 rw" +CONFIG_CMDLINE=3D"console=3DttyS0,115200 initrd=3D0x21100000,25165824 rw" CONFIG_VFP=3Dy CONFIG_NEON=3Dy CONFIG_KERNEL_MODE_NEON=3Dy diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defc= onfig index 0f55815eecb3..510c760b0bc7 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -9,7 +9,7 @@ CONFIG_NR_CPUS=3D2 CONFIG_HIGHMEM=3Dy CONFIG_ARM_APPENDED_DTB=3Dy CONFIG_ARM_ATAG_DTB_COMPAT=3Dy -CONFIG_CMDLINE=3D"root=3D/dev/ram0 console=3DttyAMA2,115200n8" +CONFIG_CMDLINE=3D"console=3DttyAMA2,115200n8" CONFIG_CPU_FREQ=3Dy CONFIG_CPU_FREQ_GOV_ONDEMAND=3Dy CONFIG_CPUFREQ_DT=3Dy diff --git a/arch/parisc/defpalo.conf b/arch/parisc/defpalo.conf index 208ff3b41487..86c9a132cb92 100644 --- a/arch/parisc/defpalo.conf +++ b/arch/parisc/defpalo.conf @@ -12,7 +12,7 @@ # If you want a root ramdisk, use the next 2 lines # (Edit the ramdisk image name!!!!) --ramdisk=3Dram-disk-image-file ---commandline=3D0/vmlinuz HOME=3D/ root=3D/dev/ram initrd=3D0/ramdisk pani= c_timeout=3D60 panic=3D-1 +--commandline=3D0/vmlinuz HOME=3D/ initrd=3D0/ramdisk panic_timeout=3D60 p= anic=3D-1 =20 # If you want NFS root, use the following command line (Edit the HOSTNAME!= !!) #--commandline=3D0/vmlinuz HOME=3D/ root=3D/dev/nfs nfsroot=3DHOSTNAME ip= =3Dbootp diff --git a/arch/s390/boot/ipl_parm.c b/arch/s390/boot/ipl_parm.c index f584d7da29cb..47fc2a7ed551 100644 --- a/arch/s390/boot/ipl_parm.c +++ b/arch/s390/boot/ipl_parm.c @@ -18,7 +18,7 @@ struct parmarea parmarea __section(".parmarea") =3D { .kernel_version =3D (unsigned long)kernel_version, .max_command_line_size =3D COMMAND_LINE_SIZE, - .command_line =3D "root=3D/dev/ram0 ro", + .command_line =3D "ro", }; =20 char __bootdata(early_command_line)[COMMAND_LINE_SIZE]; diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index f2f9cd9cde50..e8e579160c6b 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -448,7 +448,7 @@ config CMDLINE_BOOL config CMDLINE string "Initial kernel command string" depends on CMDLINE_BOOL - default "console=3DttyS0,38400 root=3D/dev/ram" + default "console=3DttyS0,38400" help On some architectures (EBSA110 and CATS), there is currently no way for the boot loader to pass arguments to the kernel. For these diff --git a/arch/xtensa/boot/dts/csp.dts b/arch/xtensa/boot/dts/csp.dts index 885495460f7e..c7e07dd0d7d0 100644 --- a/arch/xtensa/boot/dts/csp.dts +++ b/arch/xtensa/boot/dts/csp.dts @@ -8,7 +8,7 @@ / { interrupt-parent =3D <&pic>; =20 chosen { - bootargs =3D "earlycon=3Dcdns,0xfd000000,115200 console=3Dtty0 console= =3DttyPS0,115200 root=3D/dev/ram0 rw earlyprintk xilinx_uartps.rx_trigger_l= evel=3D32 loglevel=3D8 nohz=3Doff ignore_loglevel"; + bootargs =3D "earlycon=3Dcdns,0xfd000000,115200 console=3Dtty0 console= =3DttyPS0,115200 rw earlyprintk xilinx_uartps.rx_trigger_level=3D32 logleve= l=3D8 nohz=3Doff ignore_loglevel"; }; =20 memory@0 { --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) (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 606A1136672 for ; Sat, 13 Sep 2025 01:04:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725447; cv=none; b=GshyfTzmjv8e1J88PTefWfgoxB4BH5QfNJLwa71JhM4kSz5S44Kj+aZ2v7dX2snu0m8J0hGTp0/g0vn5U+XqLUzp21n764KQMW1i5pOirlI0J4cHSY2d2Np0jLp4WqFez5c7rCEUjPZ+PMQ/dvZ23lFKv/A8NVLqppGxCLJCrjs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725447; c=relaxed/simple; bh=XdKFLt7HKTWqlTaryS+0sdRR6IIe2s8E5XqHxfJZ80U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cOIypktUk5VUsGv2mIBWmtjLOtSfhyaAb4xgdwIhr/1dBLebF9w3eYa7Ig5l8rbwtDB3qnYRRpGCblz2v22GkcvUcugMVTb8mDfrumLuHmOcXI+xBW5EhRTsG/PuOeuPb/BqlyZeKxDfT6m1MWiwQHeZo8fv0L/dUfUBoEZQeGU= 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=RRwUyBVP; arc=none smtp.client-ip=209.85.208.53 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="RRwUyBVP" Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-61cc281171cso4451781a12.0 for ; Fri, 12 Sep 2025 18:04:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757725444; x=1758330244; 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=QP3KPO8+P4bejD4XvvOjfSlYK9K4kJKcAHCDef6XF+Q=; b=RRwUyBVPnVlKd0QyX7QZ/B8xHbpig+Z2q2Rr0IXtkLN1RECSatPb94HGOD60tUFHa1 4qdgmLfCmT1u7a8yJxRMhTrlQ/FKgvxR+IXG16wPGbb4rybWPlqDYRmV67YUPEgCpqRn MSir2IDCQdZySb6GZ/P0X94QU9neoYMzHjvPy7UXI/KEGAqdP5G0Rm/DnTvm8DF0rnMl TvzpWt1calnnkQkXZGiRqKin9theNHhcOi/UoxpNd22vXN3ro2sBkWj1NX6p3NuoGJgL YRJD68Kn6CszgFLoTHxMGcaDfHFvEGKbmLD0IdJUjzY4zNy1wmS+Yaqtzchrx/Eo+CpQ qZ5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757725444; x=1758330244; 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=QP3KPO8+P4bejD4XvvOjfSlYK9K4kJKcAHCDef6XF+Q=; b=RUWfiuuKK48zRTVG4b5mfflAuOl1HcrR7u8CxALSqXpZ8XaCTP5QDlgMvZNcVEWhPn OsUf/4NqPoQLvw73oFR7auMgywktDI4hlrHA0MXoyD1qn7jZZHl4ZUwe0v/CpCIYt5Nd 351vzVDCcAmUPB5uY/v+OWkKN4yZMdRn52Sz9e/31imv1HPlHc0OzV0jleeGubWPSHHq AR9++VEDUUAxpTJf3vVlB4K20RIEMJm1Jy8DcbXdLpda0JvSGdIzZ20HeLJLp/apP+ni xz2zEbrzkHHxodnoo2bDeXmvRL6uANd7QuMypipBqsHuxfqCsfGxThFyX6/xcIfqP3LK pzpg== X-Forwarded-Encrypted: i=1; AJvYcCXiZcK0WTRJIXVXYgAD4E5Ha7J40zbvDk1IWgf0JUKCINziTj3VWwdT9S3++DL8vM5Kc05DsPTnbRv2vFg=@vger.kernel.org X-Gm-Message-State: AOJu0YzypPXBwliyA3weSm9TRvsWhP1u7Ea/ccALfVIzZrqRueYJmiBs vOpxkh6nTo3C8RRK/PV1WvjULD7hFHX82kOjgUUo16P305H1HWaQd4bK X-Gm-Gg: ASbGncuss4YWpa8g3rX9aXdYKhj2PVt6cOipT3BhzcHip31Tn+SBBSw1TCLUUNSmGCA FszL4GGXj5z2yeMkp1rVtG8eDQT50P8YxJ8ZR23sVJg+zjGZvjDyjnIQ8vSV8op0Qq5tbtHAkEl ghwLyj9AfMirhAuKAc7IbwynRiSTceW4QC+x9WZUW91ysJYdY0pOZJsMTfMJg5ms6n9JkiHG9aq d43l/PV99VwawvRtILDVZv/zCqtCdeD3e+dz6SHFbw9xf7t8psBQCcigvK9EHPNctgGS5vz+e9D sHJb4LQINx32KsB6Z+ssQMFEwFOAk1yR9s8T7vPFiCSqbC8QBUCFyVnNlrRC9KpoWOxdArY1rtA i41QXnchV5t4vZNp7H4/4LsXk1a8Lfg== X-Google-Smtp-Source: AGHT+IF5gJzNBXdtzBXv0OSH4ftjGJnmmybFv16rcAGk5hl57bAzoCs28S7e9w+ysKsSQWZRdIzUSQ== X-Received: by 2002:a05:6402:3482:b0:61d:249a:43fe with SMTP id 4fb4d7f45d1cf-62ed82c5a43mr4352436a12.24.1757725443498; Fri, 12 Sep 2025 18:04:03 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id 4fb4d7f45d1cf-62ec6b6cec5sm4014207a12.1.2025.09.12.18.03.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 18:04:02 -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 22/62] doc: remove obsolete mentions of pivot_root Date: Sat, 13 Sep 2025 00:38:01 +0000 Message-ID: <20250913003842.41944-23-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" They refer to initrd, which was removed in previous commits Signed-off-by: Askar Safin --- Documentation/admin-guide/device-mapper/dm-init.rst | 4 ++-- Documentation/arch/arm/ixp4xx.rst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/admin-guide/device-mapper/dm-init.rst b/Document= ation/admin-guide/device-mapper/dm-init.rst index 981d6a907699..586bb38d716b 100644 --- a/Documentation/admin-guide/device-mapper/dm-init.rst +++ b/Documentation/admin-guide/device-mapper/dm-init.rst @@ -5,8 +5,8 @@ Early creation of mapped devices It is possible to configure a device-mapper device to act as the root devi= ce for your system in two ways. =20 -The first is to build an initial ramdisk which boots to a minimal userspace -which configures the device, then pivot_root(8) in to it. +The first is to build initramfs which boots to a minimal userspace +which configures the device, then switches to it. =20 The second is to create one or more device-mappers using the module parame= ter "dm-mod.create=3D" through the kernel boot command line argument. diff --git a/Documentation/arch/arm/ixp4xx.rst b/Documentation/arch/arm/ixp= 4xx.rst index 17aafc610908..ac9cb28776c7 100644 --- a/Documentation/arch/arm/ixp4xx.rst +++ b/Documentation/arch/arm/ixp4xx.rst @@ -137,8 +137,8 @@ Intel IXDPG425 Development Platform added. One issue with this board is that the mini-PCI slots only have the 3.3v line connected, so you can't use a PCI to mini-PCI adapter with an E100 card. So to NFS root you need to use either - the CSR or a WiFi card and a ramdisk that BOOTPs and then does - a pivot_root to NFS. + the CSR or a WiFi card and initramfs that BOOTPs and then switches + to NFS. =20 Motorola PrPMC1100 Processor Mezanine Card http://www.fountainsys.com --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (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 12B5914A60C for ; Sat, 13 Sep 2025 01:05:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725513; cv=none; b=LDZCtBjYpIjd5gsgT+DypJX4DcNssjRBNOlJhFAH8JATzDCmkGp3WVvv42m/DvikTVLvVUIIJn0aur4OgEgwUsqxT9HNW2TrOYElWJVy/l1Y+Lqzy8UF744Gnv1mnt8bie/G645Tkws3mhY59pMddzmz0KA0zspsOUPMGZCFPOw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725513; c=relaxed/simple; bh=S+LMTI5gKh7jR4HnMBjppMSsjKCA+4Wi7QuAEkwwnu8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=thWa4+FaCplt0qoSr2d7a6kEGf8roE3oKCAvpQcJHXFVS05tg3eUybmk6k7uhXbiyBElHUV00O+TSprhmBLbMORC7COhKZG9cGrrRHP4f5PccSrbhT839vM7Me8UgOmxNDCUVk8vYdchy8RzXd5q0zZIx3OgAOlmy9FIiznTv9c= 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=dXv4iNf2; arc=none smtp.client-ip=209.85.218.43 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="dXv4iNf2" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-afcb7322da8so470530966b.0 for ; Fri, 12 Sep 2025 18:05:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757725509; x=1758330309; 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=5agMVhmWz9D3tLYyZnqIaP8gTBBboQ75Wn3D7w2vh+Q=; b=dXv4iNf2H8URQWzVOiVcXlt/g9fQImXw5sgTfH+9HFtO7xY/TcP/JiWlyVtkxKLaYH HKyZQoTqjJf8lbm+SDIT59oKVrtvwBs21iYZ589G+wHyCqc08cqtn0mlfzTt9OPuOBIS MvOZqqIqMIPeNg/4A+FX8sv/zeDWyf0s8ePFAoOmS84Ek+oiXa1AVyB9nR4AHHeZvcpW rV+hwVJHVPBaVpRxyXeBWkEBhVTD33JGA+xi5mxhx68lc2NZ32dDqjn31/VizAz9l7HR +l0d4WIECCoTLmx+3hFjhe+LYu/MD207FATDiWTCBdqdHsiOU2u4rFNsDVidduqFAYo1 rrYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757725509; x=1758330309; 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=5agMVhmWz9D3tLYyZnqIaP8gTBBboQ75Wn3D7w2vh+Q=; b=BOpmwKZBvKxOh2ZtGupgPcFfeoqubOrP7je5neb9NtTLxPm2qiPu2AaovSyG19dkiZ CUhSfEwVA9VDx63A1S4MRAeMQru3iBo3dvG7vnlyfeNclnXFx3ue5zCxIv4OZzlejI2I 0EiU7lrSh0TVep0X7GN00eAwBCzQbmvvbJmkFCfgAnNHLwk2xeCNGoB3vfj+ZC8vhcrg pVZ6CV4cUo9GIplKGpu6dbfLMM0jwLAtokuiq33eszRpS8RHMCKUUoJ1S5A70/rJvWKT WbT70DmWVHMmga11BMGmdBgL8GETmzqNIGQ2DXq6JfnBPB1fLDfGAcaf5gi+Q7I5y/gI /JVA== X-Forwarded-Encrypted: i=1; AJvYcCW0LWs5Z/0XbLgFtuJSOGRfz3aft+NCeWHkMeu67mHkMyX79RuFn4nFLFtlpu2up8sqm+/8PRwpsiDkaWU=@vger.kernel.org X-Gm-Message-State: AOJu0Yyq1vx0BA7DDp3XqY+HrhmPiIBMVQMDHEC5BHDEXhVT/DqWqCUY U7yS5JO9cZ4PDJplHe7bLn9l5WJ6OiERfaDbMEYs75mvg7OnAa/g3damNrJPgds2 X-Gm-Gg: ASbGnctez+KWzOzS4alDBvOBlsFyieRmXrguGU5jQFfo01TQ9QvKZWX9QIPEHtK1zbj 7WKiksLJL8Baq+QQVWZf8eGONxrQMkJecaVXXQNP/t//GtUlsCcfVKUy7Q7YUKDNMvpYrAaStdg PCvwWcTXzfEwE6QP0FvQklee+QQEqzkWoZQ55thAlrIkEfyYVtCd6ZWHT/td/lgpFIPXejYY1/Z x6+J6rkPxfJ11fUgmiebo4c8wQ7H79499pXES+oo1/2RbImRWzNt8ueunblrA3Sqttl6oRB9vcv e83bVWSc7NbmIEBZMTQkJPQ9XYyJo3+Vp0wyK+bQewNsM+9tu8MFX0Ah0AzaYMsLCHyffFP1wvj PaoCtF5Prd3QHTIXH2xo= X-Google-Smtp-Source: AGHT+IHBVL7U9njYQbYDntatJDbtYTvNiZyrYrp6F3Zot8CfKJXHpFfpfQfFxJfdQecWj/pXbevxCg== X-Received: by 2002:a17:907:980a:b0:b04:7ea3:a10c with SMTP id a640c23a62f3a-b07c3551576mr448691266b.8.1757725509440; Fri, 12 Sep 2025 18:05:09 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b31291b0sm475372166b.34.2025.09.12.18.05.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 18:05:08 -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 23/62] init: rename __initramfs_{start,size} to __builtin_initramfs_{start,size} Date: Sat, 13 Sep 2025 00:38:02 +0000 Message-ID: <20250913003842.41944-24-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename __initramfs_start to __builtin_initramfs_start and __initramfs_size to __builtin_initramfs_size . This is more clear Signed-off-by: Askar Safin --- arch/x86/tools/relocs.c | 2 +- drivers/acpi/tables.c | 4 ++-- include/asm-generic/vmlinux.lds.h | 6 +++--- include/linux/initrd.h | 4 ++-- init/initramfs.c | 4 +--- usr/initramfs_data.S | 4 ++-- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c index 5778bc498415..4b4e556f1b52 100644 --- a/arch/x86/tools/relocs.c +++ b/arch/x86/tools/relocs.c @@ -87,7 +87,7 @@ static const char * const sym_regex_kernel[S_NSYMTYPES] = =3D { "__(start|stop)_notes|" "__end_rodata|" "__end_rodata_aligned|" - "__initramfs_start|" + "__builtin_initramfs_start|" "(jiffies|jiffies_64)|" #if ELF_BITS =3D=3D 64 "__end_rodata_hpage_align|" diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index fa9bb8c8ce95..3160cb7dca00 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -429,8 +429,8 @@ void __init acpi_table_upgrade(void) struct cpio_data file; =20 if (IS_ENABLED(CONFIG_ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD)) { - data =3D __initramfs_start; - size =3D __initramfs_size; + data =3D __builtin_initramfs_start; + size =3D __builtin_initramfs_size; } else { data =3D (void *)initrd_start; size =3D initrd_end - initrd_start; diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinu= x.lds.h index ae2d2359b79e..a6bd2ff46f7e 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -46,8 +46,8 @@ * [_sdata, _edata] is the data section * * Some of the included output section have their own set of constants. - * Examples are: [__initramfs_start, __initramfs_end] for initramfs and - * [__nosave_begin, __nosave_end] for the nosave data + * Examples are: [__builtin_initramfs_start, __builtin_initramfs_start + _= _builtin_initramfs_size] + * for initramfs and [__nosave_begin, __nosave_end] for the nosave data */ =20 #include @@ -969,7 +969,7 @@ defined(CONFIG_AUTOFDO_CLANG) || defined(CONFIG_PROPELL= ER_CLANG) #ifdef CONFIG_BLK_DEV_INITRD #define INIT_RAM_FS \ . =3D ALIGN(4); \ - __initramfs_start =3D .; \ + __builtin_initramfs_start =3D .; \ KEEP(*(.init.ramfs)) \ . =3D ALIGN(8); \ KEEP(*(.init.ramfs.info)) diff --git a/include/linux/initrd.h b/include/linux/initrd.h index cc389ef1a738..e49c7166dbb3 100644 --- a/include/linux/initrd.h +++ b/include/linux/initrd.h @@ -21,8 +21,8 @@ static inline void wait_for_initramfs(void) {} extern phys_addr_t phys_initrd_start; extern unsigned long phys_initrd_size; =20 -extern char __initramfs_start[]; -extern unsigned long __initramfs_size; +extern char __builtin_initramfs_start[]; +extern unsigned long __builtin_initramfs_size; =20 void console_on_rootfs(void); =20 diff --git a/init/initramfs.c b/init/initramfs.c index 850cb0de873e..2866d7a0afd7 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -597,8 +597,6 @@ static int __init initramfs_async_setup(char *str) } __setup("initramfs_async=3D", initramfs_async_setup); =20 -extern char __initramfs_start[]; -extern unsigned long __initramfs_size; #include #include =20 @@ -695,7 +693,7 @@ static inline bool kexec_free_initrd(void) static void __init do_populate_rootfs(void *unused, async_cookie_t cookie) { /* Load the built in initramfs */ - char *err =3D unpack_to_rootfs(__initramfs_start, __initramfs_size); + char *err =3D unpack_to_rootfs(__builtin_initramfs_start, __builtin_initr= amfs_size); if (err) panic_show_mem("%s", err); /* Failed to decompress INTERNAL initramfs */ =20 diff --git a/usr/initramfs_data.S b/usr/initramfs_data.S index cd67edc38797..64ca648a80e2 100644 --- a/usr/initramfs_data.S +++ b/usr/initramfs_data.S @@ -27,8 +27,8 @@ __irf_start: .incbin "usr/initramfs_inc_data" __irf_end: .section .init.ramfs.info,"a" -.globl __initramfs_size -__initramfs_size: +.globl __builtin_initramfs_size +__builtin_initramfs_size: #ifdef CONFIG_64BIT .quad __irf_end - __irf_start #else --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) (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 7EF5A158538 for ; Sat, 13 Sep 2025 01:06:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725578; cv=none; b=six6JFfKJm/P3ovq/PDuVULc/eYzOsyXFIXWEPiKivzwINHhfMSbOcJssezxKuO/OWGzMYgSIzfiNDMLJSPzT3CDnRwoYNLudlhds1Ly3aPj+n4/tqPQIraJg2NvHGhMXzJ+CDf/fxKQnfLSOPz/+nVv2WIyssJVJC25WA9LkPI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725578; c=relaxed/simple; bh=vklOel+wSCjK4qNA3bbVH6akiUZ5v6h3w1mLbg32yHc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=acIfRftrRrmjunpVXH0kLUnVZkVteuZZLBkxKoOVAGQLUlcoCbXZob74cRIbuAKIWM+jDy0Cf+N/E+RsrSAkCpyqugR7uk575qgMw/1eBciZ79RCp+QMuLTS3MyJU53eX0ZG0SxnzeMwCozkuuSSKmKqO/EwpwcHdojurzYRzWA= 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=i5jdjkTj; arc=none smtp.client-ip=209.85.208.45 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="i5jdjkTj" Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-61d7b2ec241so3045691a12.0 for ; Fri, 12 Sep 2025 18:06:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757725575; x=1758330375; 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=hRKyxFwRI2Qz0k3ZoQpZ3VLrtZiB303jicB3H5rLu1o=; b=i5jdjkTjtptnVRTKu9gC1FGyG631gNTKOQcNNjiV1wIGpCO9LKpi2CJ2RQ0m8t4mDH ONVWomxhe69fjxeYMmICCmXv0Rr8TDz7s6BVZICN9NwGb1N7pNZmRqZGBcz40knM2HMI W7Ji8wqwO1cw0T53Aky2TLdNt7Ux9WDivWO8koeL4yJfRdO+vqooDEJ5hMj2vZ6iRCxO FLSx379lFdhQ1bMH9wAjwlrmjDNUBqy5D7r979gfnOOIkIHRqh07UgA4qY+vpqOY4JKM u+gd3SquikxVivxA1PhfxTy/48fwXe+t0GbKjBfMbOX3kk2O1YHm9m0ES0HTMJbOYUaG GRiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757725575; x=1758330375; 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=hRKyxFwRI2Qz0k3ZoQpZ3VLrtZiB303jicB3H5rLu1o=; b=QCrIcMWSGeAT58EFX1IAsna1srRC1OE0Cyz6Zx6uEOfGWsSjskfPXjzYj30MvFfzTJ CNaVrTGbeJrudHlQoFNWxXj3APPtAeaCZifYzKpEeqa+bVAsfG36iFIbPEjRmUtg4X7b bQddJd3w2Sm1thGV6eHwl7uiIT/qxrt2U+oRMNzJWYGOXffvGoJGY+MBYQ92uWBHqmYf Z8aTxVoIkeSV4aUXDJo/0DtwPBdM+fsuRNdSm5BpOwI3PkqlMV1eGuktg2ONFAez06Jb F46CLhVT9xsVqnHTxncky1CxBjXoeZsc741Zcuw9C/5V9Eg1fUosOIxRVGIbVp4IwH1k SlSw== X-Forwarded-Encrypted: i=1; AJvYcCUe9AG9o5O6hgQvvEM+pp1QaM5b1BnFUQGll87S5982Pkm5BQvta2MbTjGqneLx56q3buSEOch5YnA58aM=@vger.kernel.org X-Gm-Message-State: AOJu0Yw794oXvx1aeStfI++CoJV74w+uyh9wf4q4t4ChZ0UuOtkK6FYL pvuU8HHPH+hJKWK8h5F1BHpjX5UqmJzwlfHdNQ5hTw5dU1EnGaT+l+MF X-Gm-Gg: ASbGnctnoi9ULchtxppGXv+4HlYi6V6uAqhoUyWNHEsEOl2PLqmw9L+G1VACJbSv28W sg2SFbmbBBJHaohfgZzEO0e0q2iOUYktoiO53tjlO3/QTmps9JDb2jd3pR/OLdL+HTLdEvMsXbr 2UTL9T+8bZZT6E5T+ptjZ9nw3mmJ+L12N5902mb3n2dZDp7dHdS3KpxI3WlhhMr0sozN+YmVN2G BrFGztPx1OROaRTrjF/u/YD8r1o16hvkwgmc9AtZ/G5p6SpTVzlSRuSVYNalblISau12ijiIs1B M20Rusbz4bVWIQvHlwxChcN+8aRgkdmjqeWZcIL7DG0JYKIOkSsr7tYQap43sPNdjohKilgDy3k 9LPkEHSQRef58byKpijFYhERQYqOmxQ== X-Google-Smtp-Source: AGHT+IFUls6LXsrCLze7uCxm9gIrKR+0qjIy+VauG9zkpfPwn7RwHzjJtZF9/Fq3L/RMfRZn925KxQ== X-Received: by 2002:a17:907:c09:b0:b04:35c3:40b3 with SMTP id a640c23a62f3a-b07c384b024mr492655366b.15.1757725574734; Fri, 12 Sep 2025 18:06:14 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07d9e18c24sm112553466b.61.2025.09.12.18.06.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 18:06:14 -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 24/62] init: remove wrong comment Date: Sat, 13 Sep 2025 00:38:03 +0000 Message-ID: <20250913003842.41944-25-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This comment is wrong. free_initrd_mem may be called with crashk_end and initrd_end as arguments Signed-off-by: Askar Safin --- include/linux/initrd.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/linux/initrd.h b/include/linux/initrd.h index e49c7166dbb3..4080ba82d4c9 100644 --- a/include/linux/initrd.h +++ b/include/linux/initrd.h @@ -6,7 +6,6 @@ /* 1 if it is not an error if initrd_start < memory_start */ extern int initrd_below_start_ok; =20 -/* free_initrd_mem always gets called with the next two as arguments.. */ extern unsigned long initrd_start, initrd_end; extern void free_initrd_mem(unsigned long, unsigned long); =20 --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (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 C4260158538 for ; Sat, 13 Sep 2025 01:07:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725646; cv=none; b=IhmRjDn3JAS4uantPS2RSLqtOrYottjdSv2Oh3Os6IvDjhmtWQzzc/jv/G4JYsDalGQ8wURHYZ49XgR/93uzNcZYVlsBgDKNwQtWiibSJM/76+ZXPXmo4ncggCIpbiJMlj5zJnMt/pJ290H8qJsH+mXRZt4nXzV7KqWTFwJHFNs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725646; c=relaxed/simple; bh=E1d34EDQ3xLKdylx+5I0KuDH5+093omadNoAqwbHK1U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Qf6FfZgtSKu1PlPzffisd4mC01qacmABjI4zod2PHpq7lCj9GiA4ml7pYFgF3oV/JK4pifdb7lbPTFZNm58g67klPUxXvVwxo4rHkuUZ9Z+wSSAf3TZ/+54+8nQ5LFmuv6podO04gGZEgOzCLxnp0mURyaWvm+nwtZ/sq8EEdH0= 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=GJGpuUy4; arc=none smtp.client-ip=209.85.218.49 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="GJGpuUy4" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-b04271cfc3eso313029166b.3 for ; Fri, 12 Sep 2025 18:07:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757725640; x=1758330440; 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=6TddlkftgluMc/5OOjsTCfHjiuASJR5DkmoxCxqoFSk=; b=GJGpuUy4VGyPoOc1WDM47UeKaMej45AtuPZ7SlHaYG0QCS69mxKmBkfbNcR1RpzrR7 qksxCCz4fYvgDmrFm7taMBiFEf5+hQ86Cb27PK+LJkwUEIfF2VOqtjsNR2FL6Dlu63Dj dMf/+rnR1ac9NwGmrwznpfi02Jxa23TZn4redTLQwdWFbQ4rRXcpkkSzUSVjgyI1BuFk YXoa6KhEYx9cLOQiKduHhbfy/9xm3pBD8hR7aQykCwrNcKzqNAYUiFLUUVWhgHnK7iem yJrQdB4ycoACHFfig9sJKbZBpA9d9cYOxDOIof2dAclbnEMmIL/AC4XNTBNaBwgMVxkk smfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757725640; x=1758330440; 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=6TddlkftgluMc/5OOjsTCfHjiuASJR5DkmoxCxqoFSk=; b=uYAPA5M0LpjVmvQ1/CgNXWUi2ZmWU+XBt+TZnfsulWBlPbK785QI8swoRAV3EwoIhl FhEq6b4H595LdhtREai0lN0FcdCQuML6FV2TOVJU+4CPQggaAfRuXFWitdWFLaM2p+6c K+RkSGulkUMt1Ksm3+beDEgHD6wAT9wFVQEzQBRsXtI7vWYxtzlFMDToptVj8Zlr1oMo kCOJzHJjswoZAU/ioRwShURkZqY/i1v26ABr7WEh6kdlIGpFpJKAFdak8sEaoiwG65KL Fe5BtFuhGKBFJiQ2oMkV5UD4zwoUwK4BmW/ELQGSbYWoywbP9G2H9NelbUYflLE8g6D4 HZkQ== X-Forwarded-Encrypted: i=1; AJvYcCU8xHPlsfnArDWi0qHbips+dpBnR2NiTFw9sQo5850lmrHOxyZkZaO/LQFdTSisqxHlytvfaTfEnjMfybw=@vger.kernel.org X-Gm-Message-State: AOJu0YyNsCk11BRQlm6OT8DDaqbcE3WbCg6CgHK7fJ0k8oVEmS4TMmXf kCQ9s1UdugeVIYclzmLEPPzsbh2FcZ6nAWGzI2jWSpmxVM3/ZIAvfGEF X-Gm-Gg: ASbGncuHvNKZsZYhWbtlSaow5QS1hTHYvTr9gtV0CzXlvTgXm4/9VES4XoKtOaSgGn0 a1ZIEWrg5x+EguY6qxWngypY09yTLsZ9xnGN2qAVq2ipmvlPGvYTugF+/1NI/tOObMOyYB6GLa2 0M9KPGBvCrXBNG4+adz4zcbzqYMA5jq3yzhAd2wwvaKyJPctyHeoPwnGPiTBZJ8H8UYqEphlAuB H0TQ2o769RTMLpjFmEsYg/Xokeanrg+TkrHBkb88S1LLwiIfeZJC9aBoCED7fu0mf3FpzRrCq4R h9W8UmT3pPYD8PDwZ4r1MBMOhcQ+RxTq/LcsggBQoOsyY4qXRD/TSpbKC/3YP3ZkFN54byvjqFm F9F596qcT14bS/y4jV/I= X-Google-Smtp-Source: AGHT+IEPa147nGJmvgvWkKDBP00lWIElqeQkHe249MsG+HewIQaHxDJ7wNuN9LkOMWVT9BrK9W88lg== X-Received: by 2002:a17:906:d185:b0:b07:de95:1c70 with SMTP id a640c23a62f3a-b07de9543bdmr137566766b.31.1757725640067; Fri, 12 Sep 2025 18:07:20 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b334e720sm472168266b.104.2025.09.12.18.07.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 18:07:19 -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 25/62] init: rename phys_initrd_{start,size} to phys_external_initramfs_{start,size} Date: Sat, 13 Sep 2025 00:38:04 +0000 Message-ID: <20250913003842.41944-26-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename phys_initrd_start to phys_external_initramfs_start and phys_initrd_size to phys_external_initramfs_size. They refer to initramfs, not to initrd Signed-off-by: Askar Safin --- arch/arc/mm/init.c | 8 ++++---- arch/arm/mm/init.c | 8 ++++---- arch/arm64/mm/init.c | 15 ++++++++------- arch/x86/kernel/setup.c | 4 ++-- drivers/firmware/efi/efi.c | 6 +++--- drivers/of/fdt.c | 8 ++++---- include/linux/initrd.h | 4 ++-- init/do_mounts_initrd.c | 8 ++++---- init/initramfs.c | 10 +++++----- 9 files changed, 36 insertions(+), 35 deletions(-) diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c index a73cc94f806e..eb8a616a63c6 100644 --- a/arch/arc/mm/init.c +++ b/arch/arc/mm/init.c @@ -110,10 +110,10 @@ void __init setup_arch_memory(void) __pa(_end) - CONFIG_LINUX_LINK_BASE); =20 #ifdef CONFIG_BLK_DEV_INITRD - if (phys_initrd_size) { - memblock_reserve(phys_initrd_start, phys_initrd_size); - initrd_start =3D (unsigned long)__va(phys_initrd_start); - initrd_end =3D initrd_start + phys_initrd_size; + if (phys_external_initramfs_size) { + memblock_reserve(phys_external_initramfs_start, phys_external_initramfs_= size); + initrd_start =3D (unsigned long)__va(phys_external_initramfs_start); + initrd_end =3D initrd_start + phys_external_initramfs_size; } #endif =20 diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 54bdca025c9f..93f8010b9115 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -55,8 +55,8 @@ static int __init parse_tag_initrd(const struct tag *tag) { pr_warn("ATAG_INITRD is deprecated; " "please update your bootloader.\n"); - phys_initrd_start =3D __virt_to_phys(tag->u.initrd.start); - phys_initrd_size =3D tag->u.initrd.size; + phys_external_initramfs_start =3D __virt_to_phys(tag->u.initrd.start); + phys_external_initramfs_size =3D tag->u.initrd.size; return 0; } =20 @@ -64,8 +64,8 @@ __tagtable(ATAG_INITRD, parse_tag_initrd); =20 static int __init parse_tag_initrd2(const struct tag *tag) { - phys_initrd_start =3D tag->u.initrd.start; - phys_initrd_size =3D tag->u.initrd.size; + phys_external_initramfs_start =3D tag->u.initrd.start; + phys_external_initramfs_size =3D tag->u.initrd.size; return 0; } =20 diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index ea84a61ed508..da517edcf824 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -246,14 +246,15 @@ void __init arm64_memblock_init(void) memblock_add(__pa_symbol(_text), (u64)(_end - _text)); } =20 - if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && phys_initrd_size) { + if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && phys_external_initramfs_size) { /* * Add back the memory we just removed if it results in the * initrd to become inaccessible via the linear mapping. * Otherwise, this is a no-op */ - u64 base =3D phys_initrd_start & PAGE_MASK; - u64 size =3D PAGE_ALIGN(phys_initrd_start + phys_initrd_size) - base; + u64 base =3D phys_external_initramfs_start & PAGE_MASK; + u64 size =3D PAGE_ALIGN(phys_external_initramfs_start + + phys_external_initramfs_size) - base; =20 /* * We can only add back the initrd memory if we don't end up @@ -267,7 +268,7 @@ void __init arm64_memblock_init(void) base + size > memblock_start_of_DRAM() + linear_region_size, "initrd not fully accessible via the linear mapping -- please check you= r bootloader ...\n")) { - phys_initrd_size =3D 0; + phys_external_initramfs_size =3D 0; } else { memblock_add(base, size); memblock_clear_nomap(base, size); @@ -280,10 +281,10 @@ void __init arm64_memblock_init(void) * pagetables with memblock. */ memblock_reserve(__pa_symbol(_stext), _end - _stext); - if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && phys_initrd_size) { + if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && phys_external_initramfs_size) { /* the generic initrd code expects virtual addresses */ - initrd_start =3D __phys_to_virt(phys_initrd_start); - initrd_end =3D initrd_start + phys_initrd_size; + initrd_start =3D __phys_to_virt(phys_external_initramfs_start); + initrd_end =3D initrd_start + phys_external_initramfs_size; } =20 early_init_fdt_scan_reserved_mem(); diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 797c3c9fc75e..e727c7a7f648 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -297,7 +297,7 @@ static u64 __init get_ramdisk_image(void) ramdisk_image |=3D (u64)boot_params.ext_ramdisk_image << 32; =20 if (ramdisk_image =3D=3D 0) - ramdisk_image =3D phys_initrd_start; + ramdisk_image =3D phys_external_initramfs_start; =20 return ramdisk_image; } @@ -308,7 +308,7 @@ static u64 __init get_ramdisk_size(void) ramdisk_size |=3D (u64)boot_params.ext_ramdisk_size << 32; =20 if (ramdisk_size =3D=3D 0) - ramdisk_size =3D phys_initrd_size; + ramdisk_size =3D phys_external_initramfs_size; =20 return ramdisk_size; } diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 1ce428e2ac8a..7cab72da2ea9 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -808,13 +808,13 @@ int __init efi_config_parse_tables(const efi_config_t= able_t *config_tables, } =20 if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && - initrd !=3D EFI_INVALID_TABLE_ADDR && phys_initrd_size =3D=3D 0) { + initrd !=3D EFI_INVALID_TABLE_ADDR && phys_external_initramfs_size = =3D=3D 0) { struct linux_efi_initrd *tbl; =20 tbl =3D early_memremap(initrd, sizeof(*tbl)); if (tbl) { - phys_initrd_start =3D tbl->base; - phys_initrd_size =3D tbl->size; + phys_external_initramfs_start =3D tbl->base; + phys_external_initramfs_size =3D tbl->size; early_memunmap(tbl, sizeof(*tbl)); } } diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 0edd639898a6..9c4c9be948c5 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -760,8 +760,8 @@ static void __early_init_dt_declare_initrd(unsigned lon= g start, { /* * __va() is not yet available this early on some platforms. In that - * case, the platform uses phys_initrd_start/phys_initrd_size instead - * and does the VA conversion itself. + * case, the platform uses phys_external_initramfs_start/phys_external_in= itramfs_size + * instead and does the VA conversion itself. */ if (!IS_ENABLED(CONFIG_ARM64) && !(IS_ENABLED(CONFIG_RISCV) && IS_ENABLED(CONFIG_64BIT))) { @@ -799,8 +799,8 @@ static void __init early_init_dt_check_for_initrd(unsig= ned long node) return; =20 __early_init_dt_declare_initrd(start, end); - phys_initrd_start =3D start; - phys_initrd_size =3D end - start; + phys_external_initramfs_start =3D start; + phys_external_initramfs_size =3D end - start; =20 pr_debug("initrd_start=3D0x%llx initrd_end=3D0x%llx\n", start, end); } diff --git a/include/linux/initrd.h b/include/linux/initrd.h index 4080ba82d4c9..23c08e88234c 100644 --- a/include/linux/initrd.h +++ b/include/linux/initrd.h @@ -17,8 +17,8 @@ static inline void __init reserve_initrd_mem(void) {} static inline void wait_for_initramfs(void) {} #endif =20 -extern phys_addr_t phys_initrd_start; -extern unsigned long phys_initrd_size; +extern phys_addr_t phys_external_initramfs_start; +extern unsigned long phys_external_initramfs_size; =20 extern char __builtin_initramfs_start[]; extern unsigned long __builtin_initramfs_size; diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c index d5264e9a52e0..444182a76999 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c @@ -15,8 +15,8 @@ unsigned long initrd_start, initrd_end; int initrd_below_start_ok; =20 -phys_addr_t phys_initrd_start __initdata; -unsigned long phys_initrd_size __initdata; +phys_addr_t phys_external_initramfs_start __initdata; +unsigned long phys_external_initramfs_size __initdata; =20 static int __init early_initrdmem(char *p) { @@ -28,8 +28,8 @@ static int __init early_initrdmem(char *p) if (*endp =3D=3D ',') { size =3D memparse(endp + 1, NULL); =20 - phys_initrd_start =3D start; - phys_initrd_size =3D size; + phys_external_initramfs_start =3D start; + phys_external_initramfs_size =3D size; } return 0; } diff --git a/init/initramfs.c b/init/initramfs.c index 2866d7a0afd7..6abe0a3ca4ce 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -610,7 +610,7 @@ void __init reserve_initrd_mem(void) /* Ignore the virtul address computed during device tree parsing */ initrd_start =3D initrd_end =3D 0; =20 - if (!phys_initrd_size) + if (!phys_external_initramfs_size) return; /* * Round the memory region to page boundaries as per free_initrd_mem() @@ -618,8 +618,8 @@ void __init reserve_initrd_mem(void) * are in use, but more importantly, reserves the entire set of pages * as we don't want these pages allocated for other purposes. */ - start =3D round_down(phys_initrd_start, PAGE_SIZE); - size =3D phys_initrd_size + (phys_initrd_start - start); + start =3D round_down(phys_external_initramfs_start, PAGE_SIZE); + size =3D phys_external_initramfs_size + (phys_external_initramfs_start - = start); size =3D round_up(size, PAGE_SIZE); =20 if (!memblock_is_region_memory(start, size)) { @@ -636,8 +636,8 @@ void __init reserve_initrd_mem(void) =20 memblock_reserve(start, size); /* Now convert initrd to virtual addresses */ - initrd_start =3D (unsigned long)__va(phys_initrd_start); - initrd_end =3D initrd_start + phys_initrd_size; + initrd_start =3D (unsigned long)__va(phys_external_initramfs_start); + initrd_end =3D initrd_start + phys_external_initramfs_size; initrd_below_start_ok =3D 1; =20 return; --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.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 A99D416CD33 for ; Sat, 13 Sep 2025 01:08:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725711; cv=none; b=ZOoSQ3Hc+RghG8zSD0lRjEIcIwj1P9+T03SYxpvDzDzYphhBJfm710kqaatvACZWAbbHITDFimqU80s/S0UzLWn2YLBnLOymZrKz2y3DNoGum3kEYu9D6YessbOEVUH7vjx0C63BHQR1FtVoyP/+7gzqFq5ALnXU+AYHZQ/ZHs0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725711; c=relaxed/simple; bh=gH7Rddwu9MUu/+t3B7A94tjqEJhL770gz/5Md0mQZOk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rojh4ts563D0zzoiZbvD2lBP99Mfukl99+lkYig8FWSb2Xv4Azi7CrJ86463oXez+s39pDaN/tU6hP8E1ppztBAniyKaUpmkfAi2bfkaPT8SVjRxFyjAig5elM5m+sq3h0vd9UL0RFYiJDbNI26Tp7X5N3/Pk7IRNXHCKJCMq5Q= 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=aN1KTiCS; arc=none smtp.client-ip=209.85.208.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="aN1KTiCS" Received: by mail-ed1-f42.google.com with SMTP id 4fb4d7f45d1cf-6188b5ad4f0so3992568a12.0 for ; Fri, 12 Sep 2025 18:08:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757725706; x=1758330506; 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=076xoEVbaVUh2WXJ09mT2DE1QkI5WvxeMmJOzlrP1Zs=; b=aN1KTiCSwNPhtSh+4uLVVS63QBvN1SQIF/X+JI6JOkxphBHQx6cZlucBweKr0dd0aN TyaIVk7Wj1K4VbPS2H1rxAtLy39JfuTVaf8ZjwqRG3ylPlDNWaL8Rk8F3bDrnhZ7xQ9e zWgd+E9p49vul5ymwY8zacDsBH+TLU0baB9Emkeu29h5FMnkiJxkorjM2Rx/2vd3Wutp N9bjlEMsBJ83lkS8d/LH2Pnq6MagRHvRD+W+JloMVC4Fp4g8J5IWzZtPVJoAMLtnuXwv zaoOA/2BrTy+aWoOHpYqAtaMEkFqAJBBJyuc53gZ0vBFnbXXf6VzmFsbv1wjwLn3amUT doXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757725706; x=1758330506; 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=076xoEVbaVUh2WXJ09mT2DE1QkI5WvxeMmJOzlrP1Zs=; b=IS9PQChnD57+HDWZzS//foEaFE8LjMoi7w877yMT3xFO15/4ZIuXK7nChR9vUQuekv ZRmT4WxIu7YY6rY/SVDVt2QbdExmC67xlt3YgZyk3eJparH+T3oxZCo63cs+xiuxQ9VS wc06WlCkSM68mL3QIZQr6jL3IHFBHcFccgKymiitgqQ7gpgKJH5hMoQ4cRl4nb8MD0Jd pBeLFH9lpUheY4dilkugBWHrvNQu8NzzPdNaZYO4zdbhwi1pypBZQHcaGGWROlWJSceH i0HxnN9zZ7kICgo1jQhN0ZcrwEckIZP856UnlVhEJzP9bkmVs4dt65IGO0O85bM20NXW NxQA== X-Forwarded-Encrypted: i=1; AJvYcCUs6GqlG9nIZXmMLG3HArG71R6NZdJkGeO+YwscQoHkceBJ/3QUwSMFDf45q6YLHAE8d232YxwlKJ5sFPU=@vger.kernel.org X-Gm-Message-State: AOJu0YwXR8oqya8QOp4P7IsKmCUHtqthiUl8k+GgQVLdrDgAqDni7ntP TE/0eUj4lGXWTtU3tIouLarZSGRPBGvkPS3sahg5QCLVmOw2ZhWG4wXc X-Gm-Gg: ASbGncto8konyoXCmIkpXiheU92+gidiwwfmuXiwQ8WQdKRxYogMElLCn0emc5f1EMq uzRAzYZHTIrmx+tgdTn5E9maVNRCSQwSDwfhstISS1xOl2zLepH6C/U6bJsYSgPaLyLe4CIHQ0m eIzRh/k8BKfiHEM8hyUKbZaOtVBFT9YxRkOt/rZu31i8oSnAtALy6Tklb4Do8z5QOqqquNfUknB 7ajSrVfDa+gTLIhnX7E/VpmlQjWFYL2MkfzKDomN9pmbFsfp1ryMlSVB4+1yhkC0IlgepyvaAcl NyFwY/N89WkKB4YWk92IeS98lwjeh95v81xfvr8TgDsZMA9KHw3EXMSFv3+gV0deoAkTl1x/uY7 t/LroRSFwwfxWLlLsKeX+W80NAJffUw== X-Google-Smtp-Source: AGHT+IGdk3XVuMADNouJH/aBQO3dgisawWr0ra1gK5dmtwng/BJ+8DUWD+mdbhpnTmhbFrSAIQbncg== X-Received: by 2002:a05:6402:26d0:b0:62e:e5b3:6388 with SMTP id 4fb4d7f45d1cf-62ee5b367b9mr3462166a12.19.1757725706048; Fri, 12 Sep 2025 18:08:26 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id 4fb4d7f45d1cf-62eff1a5c6esm720024a12.50.2025.09.12.18.08.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 18:08:24 -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 26/62] init: move phys_external_initramfs_{start,size} to init/initramfs.c Date: Sat, 13 Sep 2025 00:38:05 +0000 Message-ID: <20250913003842.41944-27-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move definitions of phys_external_initramfs_start and phys_external_initramfs_size to init/initramfs.c Signed-off-by: Askar Safin --- init/do_mounts_initrd.c | 3 --- init/initramfs.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c index 444182a76999..06be76aa602c 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c @@ -15,9 +15,6 @@ unsigned long initrd_start, initrd_end; int initrd_below_start_ok; =20 -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; diff --git a/init/initramfs.c b/init/initramfs.c index 6abe0a3ca4ce..5242d851e839 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -600,6 +600,9 @@ __setup("initramfs_async=3D", initramfs_async_setup); #include #include =20 +phys_addr_t phys_external_initramfs_start __initdata; +unsigned long phys_external_initramfs_size __initdata; + static BIN_ATTR(initrd, 0440, sysfs_bin_attr_simple_read, NULL, 0); =20 void __init reserve_initrd_mem(void) --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (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 507BB16CD33 for ; Sat, 13 Sep 2025 01:09:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725776; cv=none; b=rgzgGKhPOKauJHdvxLZyOphG7Nd7FhoaIIqVPkOeiRt4oBJxlpYGVNl0VcFZKm/sUES/O0L9YYn0Byjy6LHIRMrIsN3/U20k8EXYSz9lEky++lqHcNL5gMuC3BUap5s7kwvvekCUNAzXfUvMBZ49+kMz/b0ikKdq17J/m+yV15I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725776; c=relaxed/simple; bh=OB8rvKJ/i9Py5pg6KTYPvKorTOVHkmUl23UIALP6A5M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D4Ab/yULS0qEvTkSkp9VWkUcO9qBNfnAp4Y+YoC66agBHjUdCjbJ++y9zb+EjNF5HTJSffNGGcRfzPN03MGgcoL0WyOS2uyybycDGgWxlrmi176ypZIKnmyvuC8eAxKcOq2wQnM2ulGePuyh8DBHjlQmh2RFYYmGL93IAWrCZhI= 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=a67LsgU+; arc=none smtp.client-ip=209.85.218.44 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="a67LsgU+" Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-b042cc39551so393281266b.0 for ; Fri, 12 Sep 2025 18:09:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757725772; x=1758330572; 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=2pGfjPJCmTgFBTQIPRnE53dxXo3SbfDBvMh6uq5akyU=; b=a67LsgU+PqFcCyQYOwGfpgZYrvZLskJpWHMhCd23XBdT6GhY2QVzopMLEcTiTwcU8n aRXxksx8QL94IAJD0uxOztTCPgTj1BtWsyM/kG+nLV+TpshnC7uUxRKpC9wDTpLGZq94 ZOqsUlHJQkT2klUn9663/rY9OOFnLqMxlMyaQUlsL96ITKc6UC1tGx3tp/iTsNpX/Gl0 4qJb49YJJmcWjmVUIQnbNHgh0LOmGNGWxeSBQEvg4fPR2zxEy8hvhLyji2gZG7GN034z Lx6bYf49mEL+cge+EW32SYuLX3/YuiiyNTqmZ1EKoxUEqsDHaSGO3qHPWNhLDjtiY01k zmtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757725772; x=1758330572; 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=2pGfjPJCmTgFBTQIPRnE53dxXo3SbfDBvMh6uq5akyU=; b=pm79uH47YX2NlyuWAn4Ta3LAbEU9gO2jYvqpinO3hL5exjBXnbA32Yze8NKuI1I3GL Rb2UJh1XWISqmqB5gfOXjWBOxLv3Jv4k8GMNWgRbo4PJ7TdaqYrRYMyWSDg1uZcKPvNH 4/YsRy1Rn/aIaFixB86Mb85/P/VBn4d2qws/Fp9qbhm/iL12r23ih9peAGeWI629nUAP VC7MuAofuv8T1yszdys/LDR0elTOzi8KGFFRQBkjQmtJXIf3dxoKZDEVERWskp0iN9J8 pHPwfPDYmVWXARsEofVS15pw/B3t3aCl5k5ZifH+0cDYZ+eYPXjqjTS1laUSv9xrCODO TlqA== X-Forwarded-Encrypted: i=1; AJvYcCUU+vUq42sRHVFkYsGisvNLeCFjASUomuQpZkzqxqPglTdtL9novKNdUo/2E69AVuRbaR3dItQZGl2YF8I=@vger.kernel.org X-Gm-Message-State: AOJu0YxJ/nDuQoXqQa6X/mQ7sEhsaL9HpwHlXM4ULev/5nhxs5l1U+kU BrxFenUS/h68MC6NIrpztc6ehEpbXS1/Tn/KM9YAZ1cZLSrP2Wbz6gTx X-Gm-Gg: ASbGnctZrfhsEyXXe1tMJF1mWC/peG0QunukTIrDImrYXSG4wwZ9u8IK8aM+QXwn0q0 IG3p9SU+kFtl9YAdQ9eb08ikxdqMNQhAMANLgXJ0xrqGXewjrHxt/6Ft3AViM0b2PGbO8pj3BZ6 hRJmpxaTOcTYypmYYIMfXx8wwLYZ6D0CwvGJplwYU0ZmN5lSpmQhAPcXiJItUkOrs/tA/BN9BfQ uLG7CjMNNdsXaO087l20wJ9Uayv82QXHXAxLmx6SeNmf8JmcnyZZZOnNlt0oMpxq4QcjbSd2fVw glDpH7ORIBjPF+sN3us+Exzoc6HU0cFm8FWy8b+ADlb2XM4Q5BcyMB6ZxppLeP85dnahmjSHhaK XSOYvpfjhSJ4VDR0zFSY= X-Google-Smtp-Source: AGHT+IHrHcZIQpP/M06nOcq3Snl8FXkxUTmgmKKbhKMXWfrO9iWe4P5Ilwjf7ocqvFrLGTk9+k818w== X-Received: by 2002:a17:907:3d0c:b0:b04:250d:ee7 with SMTP id a640c23a62f3a-b07c37dca1emr487688066b.31.1757725771595; Fri, 12 Sep 2025 18:09:31 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07da7a8918sm104574066b.56.2025.09.12.18.09.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 18:09:31 -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 27/62] init: alpha: remove "extern unsigned long initrd_start, initrd_end" Date: Sat, 13 Sep 2025 00:38:06 +0000 Message-ID: <20250913003842.41944-28-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" These variables already declared in , which is included Signed-off-by: Askar Safin --- arch/alpha/kernel/core_irongate.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/alpha/kernel/core_irongate.c b/arch/alpha/kernel/core_iro= ngate.c index 05dc4c1b9074..3411564144ae 100644 --- a/arch/alpha/kernel/core_irongate.c +++ b/arch/alpha/kernel/core_irongate.c @@ -225,8 +225,6 @@ albacore_init_arch(void) alpha_mv.min_mem_address =3D pci_mem; if (memtop > pci_mem) { #ifdef CONFIG_BLK_DEV_INITRD - extern unsigned long initrd_start, initrd_end; - /* Move the initrd out of the way. */ if (initrd_end && __pa(initrd_end) > pci_mem) { unsigned long size; --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (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 30EF5192D8A for ; Sat, 13 Sep 2025 01:10:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725847; cv=none; b=dwAwEBvg/7ooN9q5xh8z0s+ih/US57022g6eZrB5S74EHpCYIYq6oAZeOK1FvmToYRjc0+hwXEmqSqhQUnyCbIx0MqMGT/1q150sfVOOiCk3bIJ3Mnko+/faTKd4PjLABaFPKSittIwo7K9DXPVF3T/MW3AdQudglRB7V369wp4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725847; c=relaxed/simple; bh=Pv4efaO6aabAZeBZ+jULi9vYDoCWTo1D7LXT2Xhcg2I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Psqvox1MwZoJF8ULSFNJ6dy3JK+YAKityn3uddqrkE1wsce7T52DxMOEQlsfPfYoWoAy/CHnRMeZFKL+BfFsYWeGT69Mh0YlbO3Bbo8FXrzWbXtk+y4DC/MP1HFu5pxunytUrDHL//Lbtsp+hLso85DFViW3ePs+Y6fFi15Ln4U= 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=lH9hM6km; arc=none smtp.client-ip=209.85.218.50 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="lH9hM6km" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-b043a33b060so375550866b.1 for ; Fri, 12 Sep 2025 18:10:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757725837; x=1758330637; 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=j9ScdAsUp9yn/MNyBXHNdfOZ1Vzp3PkVTtF+LLcFMZY=; b=lH9hM6kmOFD1pDaVAJ7ZDXyRXAwlurJU8Aa8rE8CM1JAtPmYAh0JOTuz8mr37K1/qF j1Be2M+6GEcolapN9bF6Ej3es/OM7CZ94vq1OpC8srDc2r2KRmNI5v8mmsqmjPKqsQWk v8l0dCV8s6QdRoKxFzSZPmLgMVHoSXJxgKgQE9pTsos9eIp9pcMDPqvmFwM0PYip3xLm 1x1xNU97ItadT/ASeXtcE5HXcUHkzjjP+2Lorl8MaRar3qVciK/sWLO2oYn5cVOuzeNq ddPfJk4EtKlT2o/nUig2Ls798Ee+kB9CyVnPsOs36YnVvK063RLxVD6jPZG+Yl2MLenF H2kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757725837; x=1758330637; 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=j9ScdAsUp9yn/MNyBXHNdfOZ1Vzp3PkVTtF+LLcFMZY=; b=Z3pAw3cnUKC0YAOdFHk0pj9cI7bUzAkU/MXn53VmfFlyOi/C8GtRFTgHJJMt3RMlp1 fEUt8xXa/tAxV4lOLt+S5+GjxKaOBcQ5+iMnxZlQ3ToToCsUFL2KAVMWTj40wLbyL8UX 8F4MUKHeCcRtze52vVc6yHGMx8y+xifOpFPO+qKN+Mm86ZM8UFmz7yRnVmRoi53bSDDY NKyrTvj4u4w4gkj06ZeMSCTUbLNLkA05ARrOQEnJgEq0WyTSgTFVHW477spcPo46s9ES 2WW8rOtebK50BbMotor4xLXSwqkNJgtslyuco1YdyZfpNXuXmHPIEJFH/AFQYbWqKhcM MoyA== X-Forwarded-Encrypted: i=1; AJvYcCVu6LP2NwLljR19escNUUj8j3kPDlKtqokB1UbsUE8iv7m9wv02KQjaKSdKvqVriPDplMwwEZ5dq4JRhCQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwWJ2eWXrvltlzYq/W0B+faQ93cuUrcMzSqwIi85FhdXBU6fnCX Y/qF1wbTTz+QxGcE0BZ+yIfTvtYFjXSQvOkC0Ea/GoYoQWi3wLOazzIw X-Gm-Gg: ASbGncuKYide6YNutofeSzvFPJFzOXcrqlNDQtm6vDsOUj+jiQNk2Scsi8i4qxS+fvQ P967Q4OSEP8217NejLL7yEoHHl7h/0kewH1+hJI/bSTB93XImrfXKCDRabUKTV5/9KID/P4wY/J Q3qWxjhPka5Li9m68uI1av5nCJA8fP6xlPjmI0Hf29PfdkER0oxZle2PxAGcGCZkDNZ75b3qMDm Hg2CYUPXXfiVrTrVkhv3fKFGzN9j1pBvtbAi+lue+kTpnkR4uSrnLwn7Tfca2pGGWnzCaidDUIf 3iZEyegJo5in3F7tL3OlRj2FidGtiCUKwpbQ9LbSfDACoV9ddkOPSYmL535SXrbqkY3YQqIoq3T zcPnW0GvqQYXcsWn8Vi0= X-Google-Smtp-Source: AGHT+IErcdJS++SkmdDFQub7kXyLrAwl0wUJgcAeUqGvMcuIJGTBmTSTKj7/pPWrytg0qmd7JyrHaQ== X-Received: by 2002:a17:907:1c25:b0:b04:626e:f435 with SMTP id a640c23a62f3a-b07c357a185mr463393666b.22.1757725837265; Fri, 12 Sep 2025 18:10:37 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b30da310sm467430466b.20.2025.09.12.18.10.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 18:10:36 -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 28/62] init: alpha, arc, arm, arm64, csky, m68k, microblaze, mips, nios2, openrisc, parisc, powerpc, s390, sh, sparc, um, x86, xtensa: rename initrd_{start,end} to virt_external_initramfs_{start,end} Date: Sat, 13 Sep 2025 00:38:07 +0000 Message-ID: <20250913003842.41944-29-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename initrd_start to virt_external_initramfs_start and initrd_end to virt_external_initramfs_end. They refer to initramfs, not to initrd Signed-off-by: Askar Safin --- arch/alpha/kernel/core_irongate.c | 6 ++-- arch/alpha/kernel/setup.c | 24 +++++++------- arch/arc/mm/init.c | 4 +-- arch/arm/mm/init.c | 4 +-- arch/arm64/mm/init.c | 4 +-- arch/csky/kernel/setup.c | 16 ++++----- arch/m68k/kernel/setup_mm.c | 6 ++-- arch/m68k/kernel/setup_no.c | 6 ++-- arch/m68k/kernel/uboot.c | 6 ++-- arch/microblaze/mm/init.c | 6 ++-- arch/mips/ath79/prom.c | 8 ++--- arch/mips/kernel/setup.c | 44 ++++++++++++------------- arch/mips/sibyte/common/cfe.c | 22 ++++++------- arch/nios2/kernel/setup.c | 10 +++--- arch/openrisc/kernel/setup.c | 14 ++++---- arch/parisc/kernel/pdt.c | 2 +- arch/parisc/kernel/setup.c | 4 +-- arch/parisc/mm/init.c | 24 +++++++------- arch/powerpc/kernel/prom.c | 14 ++++---- arch/powerpc/kernel/setup-common.c | 14 ++++---- arch/powerpc/platforms/powermac/setup.c | 2 +- arch/s390/kernel/setup.c | 4 +-- arch/sh/kernel/setup.c | 8 ++--- arch/sparc/mm/init_32.c | 18 +++++----- arch/sparc/mm/init_64.c | 14 ++++---- arch/um/kernel/initrd.c | 4 +-- arch/x86/kernel/cpu/microcode/core.c | 8 ++--- arch/x86/kernel/setup.c | 12 +++---- arch/xtensa/kernel/setup.c | 14 ++++---- drivers/acpi/tables.c | 4 +-- drivers/of/fdt.c | 4 +-- include/linux/initrd.h | 4 +-- init/do_mounts_initrd.c | 2 +- init/initramfs.c | 40 +++++++++++----------- init/main.c | 18 +++++----- 35 files changed, 197 insertions(+), 197 deletions(-) diff --git a/arch/alpha/kernel/core_irongate.c b/arch/alpha/kernel/core_iro= ngate.c index 3411564144ae..5519bb8fc6f2 100644 --- a/arch/alpha/kernel/core_irongate.c +++ b/arch/alpha/kernel/core_irongate.c @@ -226,11 +226,11 @@ albacore_init_arch(void) if (memtop > pci_mem) { #ifdef CONFIG_BLK_DEV_INITRD /* Move the initrd out of the way. */ - if (initrd_end && __pa(initrd_end) > pci_mem) { + if (virt_external_initramfs_end && __pa(virt_external_initramfs_end) > p= ci_mem) { unsigned long size; =20 - size =3D initrd_end - initrd_start; - memblock_free((void *)initrd_start, PAGE_ALIGN(size)); + size =3D virt_external_initramfs_end - virt_external_initramfs_start; + memblock_free((void *)virt_external_initramfs_start, PAGE_ALIGN(size)); if (!move_initrd(pci_mem)) printk("irongate_init_arch: initrd too big " "(%ldK)\ndisabling initrd\n", diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c index bebdffafaee8..a344e71b2d2a 100644 --- a/arch/alpha/kernel/setup.c +++ b/arch/alpha/kernel/setup.c @@ -268,15 +268,15 @@ move_initrd(unsigned long mem_limit) void *start; unsigned long size; =20 - size =3D initrd_end - initrd_start; + size =3D virt_external_initramfs_end - virt_external_initramfs_start; start =3D memblock_alloc(PAGE_ALIGN(size), PAGE_SIZE); if (!start || __pa(start) + size > mem_limit) { - initrd_start =3D initrd_end =3D 0; + virt_external_initramfs_start =3D virt_external_initramfs_end =3D 0; return NULL; } - memmove(start, (void *)initrd_start, size); - initrd_start =3D (unsigned long)start; - initrd_end =3D initrd_start + size; + memmove(start, (void *)virt_external_initramfs_start, size); + virt_external_initramfs_start =3D (unsigned long)start; + virt_external_initramfs_end =3D virt_external_initramfs_start + size; printk("initrd moved to %p\n", start); return start; } @@ -347,20 +347,20 @@ setup_memory(void *kernel_end) memblock_reserve(KERNEL_START_PHYS, kernel_size); =20 #ifdef CONFIG_BLK_DEV_INITRD - initrd_start =3D INITRD_START; - if (initrd_start) { - initrd_end =3D initrd_start+INITRD_SIZE; + virt_external_initramfs_start =3D INITRD_START; + if (virt_external_initramfs_start) { + virt_external_initramfs_end =3D virt_external_initramfs_start+INITRD_SIZ= E; printk("Initial ramdisk at: 0x%p (%lu bytes)\n", - (void *) initrd_start, INITRD_SIZE); + (void *) virt_external_initramfs_start, INITRD_SIZE); =20 - if ((void *)initrd_end > phys_to_virt(PFN_PHYS(max_low_pfn))) { + if ((void *)virt_external_initramfs_end > phys_to_virt(PFN_PHYS(max_low_= pfn))) { if (!move_initrd(PFN_PHYS(max_low_pfn))) printk("initrd extends beyond end of memory " "(0x%08lx > 0x%p)\ndisabling initrd\n", - initrd_end, + virt_external_initramfs_end, phys_to_virt(PFN_PHYS(max_low_pfn))); } else { - memblock_reserve(virt_to_phys((void *)initrd_start), + memblock_reserve(virt_to_phys((void *)virt_external_initramfs_start), INITRD_SIZE); } } diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c index eb8a616a63c6..1e098d7fc6af 100644 --- a/arch/arc/mm/init.c +++ b/arch/arc/mm/init.c @@ -112,8 +112,8 @@ void __init setup_arch_memory(void) #ifdef CONFIG_BLK_DEV_INITRD if (phys_external_initramfs_size) { memblock_reserve(phys_external_initramfs_start, phys_external_initramfs_= size); - initrd_start =3D (unsigned long)__va(phys_external_initramfs_start); - initrd_end =3D initrd_start + phys_external_initramfs_size; + virt_external_initramfs_start =3D (unsigned long)__va(phys_external_init= ramfs_start); + virt_external_initramfs_end =3D virt_external_initramfs_start + phys_ext= ernal_initramfs_size; } #endif =20 diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 93f8010b9115..4faeec51c522 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -439,9 +439,9 @@ void free_initmem(void) #ifdef CONFIG_BLK_DEV_INITRD void free_initrd_mem(unsigned long start, unsigned long end) { - if (start =3D=3D initrd_start) + if (start =3D=3D virt_external_initramfs_start) start =3D round_down(start, PAGE_SIZE); - if (end =3D=3D initrd_end) + if (end =3D=3D virt_external_initramfs_end) end =3D round_up(end, PAGE_SIZE); =20 poison_init_mem((void *)start, PAGE_ALIGN(end) - start); diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index da517edcf824..3414e48c8c82 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -283,8 +283,8 @@ void __init arm64_memblock_init(void) memblock_reserve(__pa_symbol(_stext), _end - _stext); if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && phys_external_initramfs_size) { /* the generic initrd code expects virtual addresses */ - initrd_start =3D __phys_to_virt(phys_external_initramfs_start); - initrd_end =3D initrd_start + phys_external_initramfs_size; + virt_external_initramfs_start =3D __phys_to_virt(phys_external_initramfs= _start); + virt_external_initramfs_end =3D virt_external_initramfs_start + phys_ext= ernal_initramfs_size; } =20 early_init_fdt_scan_reserved_mem(); diff --git a/arch/csky/kernel/setup.c b/arch/csky/kernel/setup.c index e0d6ca86ea8c..ce128888462e 100644 --- a/arch/csky/kernel/setup.c +++ b/arch/csky/kernel/setup.c @@ -17,35 +17,35 @@ static void __init setup_initrd(void) { unsigned long size; =20 - if (initrd_start >=3D initrd_end) { + if (virt_external_initramfs_start >=3D virt_external_initramfs_end) { pr_err("initrd not found or empty"); goto disable; } =20 - if (__pa(initrd_end) > PFN_PHYS(max_low_pfn)) { + if (__pa(virt_external_initramfs_end) > PFN_PHYS(max_low_pfn)) { pr_err("initrd extends beyond end of memory"); goto disable; } =20 - size =3D initrd_end - initrd_start; + size =3D virt_external_initramfs_end - virt_external_initramfs_start; =20 - if (memblock_is_region_reserved(__pa(initrd_start), size)) { + if (memblock_is_region_reserved(__pa(virt_external_initramfs_start), size= )) { pr_err("INITRD: 0x%08lx+0x%08lx overlaps in-use memory region", - __pa(initrd_start), size); + __pa(virt_external_initramfs_start), size); goto disable; } =20 - memblock_reserve(__pa(initrd_start), size); + memblock_reserve(__pa(virt_external_initramfs_start), size); =20 pr_info("Initial ramdisk at: 0x%p (%lu bytes)\n", - (void *)(initrd_start), size); + (void *)(virt_external_initramfs_start), size); =20 initrd_below_start_ok =3D 1; =20 return; =20 disable: - initrd_start =3D initrd_end =3D 0; + virt_external_initramfs_start =3D virt_external_initramfs_end =3D 0; =20 pr_err(" - disabling initrd\n"); } diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c index c7e8de0d34bb..80f0544c1041 100644 --- a/arch/m68k/kernel/setup_mm.c +++ b/arch/m68k/kernel/setup_mm.c @@ -333,9 +333,9 @@ void __init setup_arch(char **cmdline_p) paging_init(); =20 if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && m68k_ramdisk.size) { - initrd_start =3D (unsigned long)phys_to_virt(m68k_ramdisk.addr); - initrd_end =3D initrd_start + m68k_ramdisk.size; - pr_info("initrd: %08lx - %08lx\n", initrd_start, initrd_end); + virt_external_initramfs_start =3D (unsigned long)phys_to_virt(m68k_ramdi= sk.addr); + virt_external_initramfs_end =3D virt_external_initramfs_start + m68k_ram= disk.size; + pr_info("initrd: %08lx - %08lx\n", virt_external_initramfs_start, virt_e= xternal_initramfs_end); } =20 #ifdef CONFIG_NATFEAT diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c index f724875b15cc..4d98e0063725 100644 --- a/arch/m68k/kernel/setup_no.c +++ b/arch/m68k/kernel/setup_no.c @@ -155,9 +155,9 @@ void __init setup_arch(char **cmdline_p) max_pfn =3D max_low_pfn =3D PFN_DOWN(memory_end); =20 #if defined(CONFIG_UBOOT) && defined(CONFIG_BLK_DEV_INITRD) - if ((initrd_start > 0) && (initrd_start < initrd_end) && - (initrd_end < memory_end)) - memblock_reserve(initrd_start, initrd_end - initrd_start); + if ((virt_external_initramfs_start > 0) && (virt_external_initramfs_start= < virt_external_initramfs_end) && + (virt_external_initramfs_end < memory_end)) + memblock_reserve(virt_external_initramfs_start, virt_external_initramfs_= end - virt_external_initramfs_start); #endif /* if defined(CONFIG_BLK_DEV_INITRD) */ =20 /* diff --git a/arch/m68k/kernel/uboot.c b/arch/m68k/kernel/uboot.c index d278060a250c..5fc831a0794a 100644 --- a/arch/m68k/kernel/uboot.c +++ b/arch/m68k/kernel/uboot.c @@ -81,9 +81,9 @@ static void __init parse_uboot_commandline(char *commandp= , int size) =20 if (uboot_initrd_start && uboot_initrd_end && (uboot_initrd_end > uboot_initrd_start)) { - initrd_start =3D uboot_initrd_start; - initrd_end =3D uboot_initrd_end; - pr_info("initrd at 0x%lx:0x%lx\n", initrd_start, initrd_end); + virt_external_initramfs_start =3D uboot_initrd_start; + virt_external_initramfs_end =3D uboot_initrd_end; + pr_info("initrd at 0x%lx:0x%lx\n", virt_external_initramfs_start, virt_e= xternal_initramfs_end); } #endif /* if defined(CONFIG_BLK_DEV_INITRD) */ } diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c index 31d475cdb1c5..fabeca49c2c6 100644 --- a/arch/microblaze/mm/init.c +++ b/arch/microblaze/mm/init.c @@ -202,10 +202,10 @@ asmlinkage void __init mmu_init(void) =20 #if defined(CONFIG_BLK_DEV_INITRD) /* Remove the init RAM disk from the available memory. */ - if (initrd_start) { + if (virt_external_initramfs_start) { unsigned long size; - size =3D initrd_end - initrd_start; - memblock_reserve(__virt_to_phys(initrd_start), size); + size =3D virt_external_initramfs_end - virt_external_initramfs_start; + memblock_reserve(__virt_to_phys(virt_external_initramfs_start), size); } #endif /* CONFIG_BLK_DEV_INITRD */ =20 diff --git a/arch/mips/ath79/prom.c b/arch/mips/ath79/prom.c index cc6dc5600677..506dcada711b 100644 --- a/arch/mips/ath79/prom.c +++ b/arch/mips/ath79/prom.c @@ -25,10 +25,10 @@ void __init prom_init(void) =20 #ifdef CONFIG_BLK_DEV_INITRD /* Read the initrd address from the firmware environment */ - initrd_start =3D fw_getenvl("initrd_start"); - if (initrd_start) { - initrd_start =3D KSEG0ADDR(initrd_start); - initrd_end =3D initrd_start + fw_getenvl("initrd_size"); + virt_external_initramfs_start =3D fw_getenvl("initrd_start"); + if (virt_external_initramfs_start) { + virt_external_initramfs_start =3D KSEG0ADDR(virt_external_initramfs_star= t); + virt_external_initramfs_end =3D virt_external_initramfs_start + fw_geten= vl("initrd_size"); } #endif } diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index a78e24873231..da11ae875539 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -126,15 +126,15 @@ static int __init rd_start_early(char *p) if (start < XKPHYS) start =3D (int)start; #endif - initrd_start =3D start; - initrd_end +=3D start; + virt_external_initramfs_start =3D start; + virt_external_initramfs_end +=3D start; return 0; } early_param("rd_start", rd_start_early); =20 static int __init rd_size_early(char *p) { - initrd_end +=3D memparse(p, &p); + virt_external_initramfs_end +=3D memparse(p, &p); return 0; } early_param("rd_size", rd_size_early); @@ -146,13 +146,13 @@ static unsigned long __init init_initrd(void) =20 /* * Board specific code or command line parser should have - * already set up initrd_start and initrd_end. In these cases + * already set up virt_external_initramfs_start and virt_external_initram= fs_end. In these cases * perform sanity checks and use them if all looks good. */ - if (!initrd_start || initrd_end <=3D initrd_start) + if (!virt_external_initramfs_start || virt_external_initramfs_end <=3D vi= rt_external_initramfs_start) goto disable; =20 - if (initrd_start & ~PAGE_MASK) { + if (virt_external_initramfs_start & ~PAGE_MASK) { pr_err("initrd start must be page aligned\n"); goto disable; } @@ -164,19 +164,19 @@ static unsigned long __init init_initrd(void) * 32-bit. We need also to switch from KSEG0 to XKPHYS * addresses now, so the code can now safely use __pa(). */ - end =3D __pa(initrd_end); - initrd_end =3D (unsigned long)__va(end); - initrd_start =3D (unsigned long)__va(__pa(initrd_start)); + end =3D __pa(virt_external_initramfs_end); + virt_external_initramfs_end =3D (unsigned long)__va(end); + virt_external_initramfs_start =3D (unsigned long)__va(__pa(virt_external_= initramfs_start)); =20 - if (initrd_start < PAGE_OFFSET) { + if (virt_external_initramfs_start < PAGE_OFFSET) { pr_err("initrd start < PAGE_OFFSET\n"); goto disable; } =20 return PFN_UP(end); disable: - initrd_start =3D 0; - initrd_end =3D 0; + virt_external_initramfs_start =3D 0; + virt_external_initramfs_end =3D 0; return 0; } =20 @@ -189,21 +189,21 @@ static void __init maybe_bswap_initrd(void) u64 buf; =20 /* Check for CPIO signature */ - if (!memcmp((void *)initrd_start, "070701", 6)) + if (!memcmp((void *)virt_external_initramfs_start, "070701", 6)) return; =20 /* Check for compressed initrd */ - if (decompress_method((unsigned char *)initrd_start, 8, NULL)) + if (decompress_method((unsigned char *)virt_external_initramfs_start, 8, = NULL)) return; =20 /* Try again with a byte swapped header */ - buf =3D swab64p((u64 *)initrd_start); + buf =3D swab64p((u64 *)virt_external_initramfs_start); if (!memcmp(&buf, "070701", 6) || decompress_method((unsigned char *)(&buf), 8, NULL)) { unsigned long i; =20 pr_info("Byteswapped initrd detected\n"); - for (i =3D initrd_start; i < ALIGN(initrd_end, 8); i +=3D 8) + for (i =3D virt_external_initramfs_start; i < ALIGN(virt_external_initra= mfs_end, 8); i +=3D 8) swab64s((u64 *)i); } #endif @@ -211,29 +211,29 @@ static void __init maybe_bswap_initrd(void) =20 static void __init finalize_initrd(void) { - unsigned long size =3D initrd_end - initrd_start; + unsigned long size =3D virt_external_initramfs_end - virt_external_initra= mfs_start; =20 if (size =3D=3D 0) { printk(KERN_INFO "Initrd not found or empty"); goto disable; } - if (__pa(initrd_end) > PFN_PHYS(max_low_pfn)) { + if (__pa(virt_external_initramfs_end) > PFN_PHYS(max_low_pfn)) { printk(KERN_ERR "Initrd extends beyond end of memory"); goto disable; } =20 maybe_bswap_initrd(); =20 - memblock_reserve(__pa(initrd_start), size); + memblock_reserve(__pa(virt_external_initramfs_start), size); initrd_below_start_ok =3D 1; =20 pr_info("Initial ramdisk at: 0x%lx (%lu bytes)\n", - initrd_start, size); + virt_external_initramfs_start, size); return; disable: printk(KERN_CONT " - disabling initrd\n"); - initrd_start =3D 0; - initrd_end =3D 0; + virt_external_initramfs_start =3D 0; + virt_external_initramfs_end =3D 0; } =20 #else /* !CONFIG_BLK_DEV_INITRD */ diff --git a/arch/mips/sibyte/common/cfe.c b/arch/mips/sibyte/common/cfe.c index 2cb90dbbe843..642b7d615594 100644 --- a/arch/mips/sibyte/common/cfe.c +++ b/arch/mips/sibyte/common/cfe.c @@ -38,7 +38,7 @@ int cfe_cons_handle; =20 #ifdef CONFIG_BLK_DEV_INITRD -extern unsigned long initrd_start, initrd_end; +extern unsigned long virt_external_initramfs_start, virt_external_initramf= s_end; #endif =20 static void __noreturn cfe_linux_exit(void *arg) @@ -86,9 +86,9 @@ static __init void prom_meminit(void) unsigned long initrd_pstart; unsigned long initrd_pend; =20 - initrd_pstart =3D CPHYSADDR(initrd_start); - initrd_pend =3D CPHYSADDR(initrd_end); - if (initrd_start && + initrd_pstart =3D CPHYSADDR(virt_external_initramfs_start); + initrd_pend =3D CPHYSADDR(virt_external_initramfs_end); + if (virt_external_initramfs_start && ((initrd_pstart > MAX_RAM_SIZE) || (initrd_pend > MAX_RAM_SIZE))) { panic("initrd out of addressable memory"); @@ -105,7 +105,7 @@ static __init void prom_meminit(void) * ramdisk */ #ifdef CONFIG_BLK_DEV_INITRD - if (initrd_start) { + if (virt_external_initramfs_start) { if ((initrd_pstart > addr) && (initrd_pstart < (addr + size))) { memblock_add(addr, @@ -139,7 +139,7 @@ static __init void prom_meminit(void) } } #ifdef CONFIG_BLK_DEV_INITRD - if (initrd_start) { + if (virt_external_initramfs_start) { memblock_add(initrd_pstart, initrd_pend - initrd_pstart); memblock_reserve(initrd_pstart, initrd_pend - initrd_pstart); } @@ -183,17 +183,17 @@ static int __init initrd_setup(char *str) goto fail; } *(tmp-1) =3D '@'; - initrd_start =3D simple_strtoul(tmp, &endptr, 16); + virt_external_initramfs_start =3D simple_strtoul(tmp, &endptr, 16); if (*endptr) { goto fail; } - initrd_end =3D initrd_start + initrd_size; - printk("Found initrd of %lx@%lx\n", initrd_size, initrd_start); + virt_external_initramfs_end =3D virt_external_initramfs_start + initrd_si= ze; + printk("Found initrd of %lx@%lx\n", initrd_size, virt_external_initramfs_= start); return 1; fail: printk("Bad initrd argument. Disabling initrd\n"); - initrd_start =3D 0; - initrd_end =3D 0; + virt_external_initramfs_start =3D 0; + virt_external_initramfs_end =3D 0; return 1; } =20 diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c index 2a40150142c3..3cc44fa4931c 100644 --- a/arch/nios2/kernel/setup.c +++ b/arch/nios2/kernel/setup.c @@ -109,8 +109,8 @@ asmlinkage void __init nios2_boot_init(unsigned r4, uns= igned r5, unsigned r6, if (r4 =3D=3D 0x534f494e) { /* r4 is magic NIOS */ #if defined(CONFIG_BLK_DEV_INITRD) if (r5) { /* initramfs */ - initrd_start =3D r5; - initrd_end =3D r6; + virt_external_initramfs_start =3D r5; + virt_external_initramfs_end =3D r6; } #endif /* CONFIG_BLK_DEV_INITRD */ dtb_passed =3D r6; @@ -161,9 +161,9 @@ void __init setup_arch(char **cmdline_p) =20 memblock_reserve(__pa_symbol(_stext), _end - _stext); #ifdef CONFIG_BLK_DEV_INITRD - if (initrd_start) { - memblock_reserve(virt_to_phys((void *)initrd_start), - initrd_end - initrd_start); + if (virt_external_initramfs_start) { + memblock_reserve(virt_to_phys((void *)virt_external_initramfs_start), + virt_external_initramfs_end - virt_external_initramfs_start); } #endif /* CONFIG_BLK_DEV_INITRD */ =20 diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c index a9fb9cc6779e..f387dc57ec35 100644 --- a/arch/openrisc/kernel/setup.c +++ b/arch/openrisc/kernel/setup.c @@ -77,9 +77,9 @@ static void __init setup_memory(void) =20 #ifdef CONFIG_BLK_DEV_INITRD /* Then reserve the initrd, if any */ - if (initrd_start && (initrd_end > initrd_start)) { - unsigned long aligned_start =3D ALIGN_DOWN(initrd_start, PAGE_SIZE); - unsigned long aligned_end =3D ALIGN(initrd_end, PAGE_SIZE); + if (virt_external_initramfs_start && (virt_external_initramfs_end > virt_= external_initramfs_start)) { + unsigned long aligned_start =3D ALIGN_DOWN(virt_external_initramfs_start= , PAGE_SIZE); + unsigned long aligned_end =3D ALIGN(virt_external_initramfs_end, PAGE_SI= ZE); =20 memblock_reserve(__pa(aligned_start), aligned_end - aligned_start); } @@ -239,13 +239,13 @@ void __init setup_arch(char **cmdline_p) setup_initial_init_mm(_stext, _etext, _edata, _end); =20 #ifdef CONFIG_BLK_DEV_INITRD - if (initrd_start =3D=3D initrd_end) { + if (virt_external_initramfs_start =3D=3D virt_external_initramfs_end) { printk(KERN_INFO "Initial ramdisk not found\n"); - initrd_start =3D 0; - initrd_end =3D 0; + virt_external_initramfs_start =3D 0; + virt_external_initramfs_end =3D 0; } else { printk(KERN_INFO "Initial ramdisk at: 0x%p (%lu bytes)\n", - (void *)(initrd_start), initrd_end - initrd_start); + (void *)(virt_external_initramfs_start), virt_external_initramfs_= end - virt_external_initramfs_start); initrd_below_start_ok =3D 1; } #endif diff --git a/arch/parisc/kernel/pdt.c b/arch/parisc/kernel/pdt.c index b70b67adb855..3715a3b088a7 100644 --- a/arch/parisc/kernel/pdt.c +++ b/arch/parisc/kernel/pdt.c @@ -229,7 +229,7 @@ void __init pdc_pdt_init(void) =20 addr =3D pdt_entry[i] & PDT_ADDR_PHYS_MASK; if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && - addr >=3D initrd_start && addr < initrd_end) + addr >=3D virt_external_initramfs_start && addr < virt_external_initram= fs_end) pr_crit("CRITICAL: initrd possibly broken " "due to bad memory!\n"); =20 diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c index ace483b6f19a..41f45fa177d0 100644 --- a/arch/parisc/kernel/setup.c +++ b/arch/parisc/kernel/setup.c @@ -71,8 +71,8 @@ static void __init setup_cmdline(char **cmdline_p) #ifdef CONFIG_BLK_DEV_INITRD /* did palo pass us a ramdisk? */ if (boot_args[2] !=3D 0) { - initrd_start =3D (unsigned long)__va(boot_args[2]); - initrd_end =3D (unsigned long)__va(boot_args[3]); + virt_external_initramfs_start =3D (unsigned long)__va(boot_args[2]); + virt_external_initramfs_end =3D (unsigned long)__va(boot_args[3]); } #endif =20 diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index 14270715d754..74bfe9797589 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c @@ -298,20 +298,20 @@ static void __init setup_bootmem(void) #endif =20 #ifdef CONFIG_BLK_DEV_INITRD - if (initrd_start) { - printk(KERN_INFO "initrd: %08lx-%08lx\n", initrd_start, initrd_end); - if (__pa(initrd_start) < mem_max) { + if (virt_external_initramfs_start) { + printk(KERN_INFO "initrd: %08lx-%08lx\n", virt_external_initramfs_start,= virt_external_initramfs_end); + if (__pa(virt_external_initramfs_start) < mem_max) { unsigned long initrd_reserve; =20 - if (__pa(initrd_end) > mem_max) { - initrd_reserve =3D mem_max - __pa(initrd_start); + if (__pa(virt_external_initramfs_end) > mem_max) { + initrd_reserve =3D mem_max - __pa(virt_external_initramfs_start); } else { - initrd_reserve =3D initrd_end - initrd_start; + initrd_reserve =3D virt_external_initramfs_end - virt_external_initram= fs_start; } initrd_below_start_ok =3D 1; - printk(KERN_INFO "initrd: reserving %08lx-%08lx (mem_max %08lx)\n", __p= a(initrd_start), __pa(initrd_start) + initrd_reserve, mem_max); + printk(KERN_INFO "initrd: reserving %08lx-%08lx (mem_max %08lx)\n", __p= a(virt_external_initramfs_start), __pa(virt_external_initramfs_start) + ini= trd_reserve, mem_max); =20 - memblock_reserve(__pa(initrd_start), initrd_reserve); + memblock_reserve(__pa(virt_external_initramfs_start), initrd_reserve); } } #endif @@ -633,10 +633,10 @@ static void __init pagetable_init(void) } =20 #ifdef CONFIG_BLK_DEV_INITRD - if (initrd_end && initrd_end > mem_limit) { - printk(KERN_INFO "initrd: mapping %08lx-%08lx\n", initrd_start, initrd_e= nd); - map_pages(initrd_start, __pa(initrd_start), - initrd_end - initrd_start, PAGE_KERNEL, 0); + if (virt_external_initramfs_end && virt_external_initramfs_end > mem_limi= t) { + printk(KERN_INFO "initrd: mapping %08lx-%08lx\n", virt_external_initramf= s_start, virt_external_initramfs_end); + map_pages(virt_external_initramfs_start, __pa(virt_external_initramfs_st= art), + virt_external_initramfs_end - virt_external_initramfs_start, PAGE_KER= NEL, 0); } #endif =20 diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 9ed9dde7d231..b7858b0bd697 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -97,11 +97,11 @@ early_param("mem", early_parse_mem); static inline int overlaps_initrd(unsigned long start, unsigned long size) { #ifdef CONFIG_BLK_DEV_INITRD - if (!initrd_start) + if (!virt_external_initramfs_start) return 0; =20 - return (start + size) > ALIGN_DOWN(initrd_start, PAGE_SIZE) && - start <=3D ALIGN(initrd_end, PAGE_SIZE); + return (start + size) > ALIGN_DOWN(virt_external_initramfs_start, PAGE_SI= ZE) && + start <=3D ALIGN(virt_external_initramfs_end, PAGE_SIZE); #else return 0; #endif @@ -686,10 +686,10 @@ static void __init early_reserve_mem(void) =20 #ifdef CONFIG_BLK_DEV_INITRD /* Then reserve the initrd, if any */ - if (initrd_start && (initrd_end > initrd_start)) { - memblock_reserve(ALIGN_DOWN(__pa(initrd_start), PAGE_SIZE), - ALIGN(initrd_end, PAGE_SIZE) - - ALIGN_DOWN(initrd_start, PAGE_SIZE)); + if (virt_external_initramfs_start && (virt_external_initramfs_end > virt_= external_initramfs_start)) { + memblock_reserve(ALIGN_DOWN(__pa(virt_external_initramfs_start), PAGE_SI= ZE), + ALIGN(virt_external_initramfs_end, PAGE_SIZE) - + ALIGN_DOWN(virt_external_initramfs_start, PAGE_SIZE)); } #endif /* CONFIG_BLK_DEV_INITRD */ =20 diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup= -common.c index 97d330f3b8f1..eff369cba0e5 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -360,17 +360,17 @@ const struct seq_operations cpuinfo_op =3D { void __init check_for_initrd(void) { #ifdef CONFIG_BLK_DEV_INITRD - DBG(" -> check_for_initrd() initrd_start=3D0x%lx initrd_end=3D0x%lx\n", - initrd_start, initrd_end); + DBG(" -> check_for_initrd() virt_external_initramfs_start=3D0x%lx virt_= external_initramfs_end=3D0x%lx\n", + virt_external_initramfs_start, virt_external_initramfs_end); =20 /* If we were not passed an sensible initramfs, clear initramfs reference. */ - if (!(is_kernel_addr(initrd_start) && is_kernel_addr(initrd_end) && - initrd_end > initrd_start)) - initrd_start =3D initrd_end =3D 0; + if (!(is_kernel_addr(virt_external_initramfs_start) && is_kernel_addr(vir= t_external_initramfs_end) && + virt_external_initramfs_end > virt_external_initramfs_start)) + virt_external_initramfs_start =3D virt_external_initramfs_end =3D 0; =20 - if (initrd_start) - pr_info("Found initramfs at 0x%lx:0x%lx\n", initrd_start, initrd_end); + if (virt_external_initramfs_start) + pr_info("Found initramfs at 0x%lx:0x%lx\n", virt_external_initramfs_star= t, virt_external_initramfs_end); =20 DBG(" <- check_for_initrd()\n"); #endif /* CONFIG_BLK_DEV_INITRD */ diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platfor= ms/powermac/setup.c index 237d8386a3f4..4c3b9ed5428d 100644 --- a/arch/powerpc/platforms/powermac/setup.c +++ b/arch/powerpc/platforms/powermac/setup.c @@ -296,7 +296,7 @@ static void __init pmac_setup_arch(void) #endif #ifdef CONFIG_PPC32 #ifdef CONFIG_BLK_DEV_INITRD - if (!initrd_start) + if (!virt_external_initramfs_start) #endif ROOT_DEV =3D DEFAULT_ROOT_DEVICE; #endif diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index a4ce721b7fe8..9bdb6f6b893e 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -672,8 +672,8 @@ static void __init reserve_initrd(void) =20 if (!IS_ENABLED(CONFIG_BLK_DEV_INITRD) || !get_physmem_reserved(RR_INITRD= , &addr, &size)) return; - initrd_start =3D (unsigned long)__va(addr); - initrd_end =3D initrd_start + size; + virt_external_initramfs_start =3D (unsigned long)__va(addr); + virt_external_initramfs_end =3D virt_external_initramfs_start + size; memblock_reserve(addr, size); } =20 diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index c4312ee13db9..9ce9dc5b9e56 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -153,16 +153,16 @@ void __init check_for_initrd(void) /* * Address sanitization */ - initrd_start =3D (unsigned long)__va(start); - initrd_end =3D initrd_start + INITRD_SIZE; + virt_external_initramfs_start =3D (unsigned long)__va(start); + virt_external_initramfs_end =3D virt_external_initramfs_start + INITRD_SI= ZE; =20 - memblock_reserve(__pa(initrd_start), INITRD_SIZE); + memblock_reserve(__pa(virt_external_initramfs_start), INITRD_SIZE); =20 return; =20 disable: pr_info("initrd disabled\n"); - initrd_start =3D initrd_end =3D 0; + virt_external_initramfs_start =3D virt_external_initramfs_end =3D 0; #endif } =20 diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c index fdc93dd12c3e..7b7722ff5232 100644 --- a/arch/sparc/mm/init_32.c +++ b/arch/sparc/mm/init_32.c @@ -109,20 +109,20 @@ static void __init find_ramdisk(unsigned long end_of_= phys_memory) if (sparc_ramdisk_image) { if (sparc_ramdisk_image >=3D (unsigned long)&_end - 2 * PAGE_SIZE) sparc_ramdisk_image -=3D KERNBASE; - initrd_start =3D sparc_ramdisk_image + phys_base; - initrd_end =3D initrd_start + sparc_ramdisk_size; - if (initrd_end > end_of_phys_memory) { + virt_external_initramfs_start =3D sparc_ramdisk_image + phys_base; + virt_external_initramfs_end =3D virt_external_initramfs_start + sparc_ra= mdisk_size; + if (virt_external_initramfs_end > end_of_phys_memory) { printk(KERN_CRIT "initrd extends beyond end of memory " "(0x%016lx > 0x%016lx)\ndisabling initrd\n", - initrd_end, end_of_phys_memory); - initrd_start =3D 0; + virt_external_initramfs_end, end_of_phys_memory); + virt_external_initramfs_start =3D 0; } else { /* Reserve the initrd image area. */ - size =3D initrd_end - initrd_start; - memblock_reserve(initrd_start, size); + size =3D virt_external_initramfs_end - virt_external_initramfs_start; + memblock_reserve(virt_external_initramfs_start, size); =20 - initrd_start =3D (initrd_start - phys_base) + PAGE_OFFSET; - initrd_end =3D (initrd_end - phys_base) + PAGE_OFFSET; + virt_external_initramfs_start =3D (virt_external_initramfs_start - phys= _base) + PAGE_OFFSET; + virt_external_initramfs_end =3D (virt_external_initramfs_end - phys_bas= e) + PAGE_OFFSET; } } #endif diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index 7ed58bf3aaca..af249a654e79 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c @@ -901,13 +901,13 @@ static void __init find_ramdisk(unsigned long phys_ba= se) numadbg("Found ramdisk at physical address 0x%lx, size %u\n", ramdisk_image, sparc_ramdisk_size); =20 - initrd_start =3D ramdisk_image; - initrd_end =3D ramdisk_image + sparc_ramdisk_size; + virt_external_initramfs_start =3D ramdisk_image; + virt_external_initramfs_end =3D ramdisk_image + sparc_ramdisk_size; =20 - memblock_reserve(initrd_start, sparc_ramdisk_size); + memblock_reserve(virt_external_initramfs_start, sparc_ramdisk_size); =20 - initrd_start +=3D PAGE_OFFSET; - initrd_end +=3D PAGE_OFFSET; + virt_external_initramfs_start +=3D PAGE_OFFSET; + virt_external_initramfs_end +=3D PAGE_OFFSET; } #endif } @@ -2485,8 +2485,8 @@ int page_in_phys_avail(unsigned long paddr) if (paddr >=3D kern_base && paddr < (kern_base + kern_size)) return 1; #ifdef CONFIG_BLK_DEV_INITRD - if (paddr >=3D __pa(initrd_start) && - paddr < __pa(PAGE_ALIGN(initrd_end))) + if (paddr >=3D __pa(virt_external_initramfs_start) && + paddr < __pa(PAGE_ALIGN(virt_external_initramfs_end))) return 1; #endif =20 diff --git a/arch/um/kernel/initrd.c b/arch/um/kernel/initrd.c index 99dba827461c..e6113192a6b6 100644 --- a/arch/um/kernel/initrd.c +++ b/arch/um/kernel/initrd.c @@ -27,8 +27,8 @@ int __init read_initrd(void) if (!area) return 0; =20 - initrd_start =3D (unsigned long) area; - initrd_end =3D initrd_start + size; + virt_external_initramfs_start =3D (unsigned long) area; + virt_external_initramfs_end =3D virt_external_initramfs_start + size; return 0; } =20 diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/mic= rocode/core.c index b92e09a87c69..b8169f14d175 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -213,13 +213,13 @@ struct cpio_data __init find_microcode_in_initrd(cons= t char *path) #endif =20 /* - * Fixup the start address: after reserve_initrd() runs, initrd_start + * Fixup the start address: after reserve_initrd() runs, virt_external_in= itramfs_start * has the virtual address of the beginning of the initrd. It also - * possibly relocates the ramdisk. In either case, initrd_start contains + * possibly relocates the ramdisk. In either case, virt_external_initramf= s_start contains * the updated address so use that instead. */ - if (initrd_start) - start =3D initrd_start; + if (virt_external_initramfs_start) + start =3D virt_external_initramfs_start; =20 return find_cpio_data(path, (void *)start, size, NULL); #else /* !CONFIG_BLK_DEV_INITRD */ diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index e727c7a7f648..167b9ef12ebb 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -328,12 +328,12 @@ static void __init relocate_initrd(void) panic("Cannot find place for new RAMDISK of size %lld\n", ramdisk_size); =20 - initrd_start =3D relocated_ramdisk + PAGE_OFFSET; - initrd_end =3D initrd_start + ramdisk_size; + virt_external_initramfs_start =3D relocated_ramdisk + PAGE_OFFSET; + virt_external_initramfs_end =3D virt_external_initramfs_start + ramdisk= _size; printk(KERN_INFO "Allocated new RAMDISK: [mem %#010llx-%#010llx]\n", relocated_ramdisk, relocated_ramdisk + ramdisk_size - 1); =20 - ret =3D copy_from_early_mem((void *)initrd_start, ramdisk_image, ramdisk_= size); + ret =3D copy_from_early_mem((void *)virt_external_initramfs_start, ramdis= k_image, ramdisk_size); if (ret) panic("Copy RAMDISK failed\n"); =20 @@ -368,7 +368,7 @@ static void __init reserve_initrd(void) !ramdisk_image || !ramdisk_size) return; /* No initrd provided by bootloader */ =20 - initrd_start =3D 0; + virt_external_initramfs_start =3D 0; =20 printk(KERN_INFO "RAMDISK: [mem %#010llx-%#010llx]\n", ramdisk_image, ramdisk_end - 1); @@ -376,8 +376,8 @@ static void __init reserve_initrd(void) if (pfn_range_is_mapped(PFN_DOWN(ramdisk_image), PFN_DOWN(ramdisk_end))) { /* All are mapped, easy case */ - initrd_start =3D ramdisk_image + PAGE_OFFSET; - initrd_end =3D initrd_start + ramdisk_size; + virt_external_initramfs_start =3D ramdisk_image + PAGE_OFFSET; + virt_external_initramfs_end =3D virt_external_initramfs_start + ramdisk_= size; return; } =20 diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index f72e280363be..2e9003be3e8c 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -49,8 +49,8 @@ #include =20 #ifdef CONFIG_BLK_DEV_INITRD -extern unsigned long initrd_start; -extern unsigned long initrd_end; +extern unsigned long virt_external_initramfs_start; +extern unsigned long virt_external_initramfs_end; extern int initrd_below_start_ok; #endif =20 @@ -106,8 +106,8 @@ static int __init parse_tag_initrd(const bp_tag_t* tag) { struct bp_meminfo *mi =3D (struct bp_meminfo *)(tag->data); =20 - initrd_start =3D (unsigned long)__va(mi->start); - initrd_end =3D (unsigned long)__va(mi->end); + virt_external_initramfs_start =3D (unsigned long)__va(mi->start); + virt_external_initramfs_end =3D (unsigned long)__va(mi->end); =20 return 0; } @@ -290,11 +290,11 @@ void __init setup_arch(char **cmdline_p) /* Reserve some memory regions */ =20 #ifdef CONFIG_BLK_DEV_INITRD - if (initrd_start < initrd_end && - !mem_reserve(__pa(initrd_start), __pa(initrd_end))) + if (virt_external_initramfs_start < virt_external_initramfs_end && + !mem_reserve(__pa(virt_external_initramfs_start), __pa(virt_external_= initramfs_end))) initrd_below_start_ok =3D 1; else - initrd_start =3D 0; + virt_external_initramfs_start =3D 0; #endif =20 mem_reserve(__pa(_stext), __pa(_end)); diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index 3160cb7dca00..37ad99c10ac4 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -432,8 +432,8 @@ void __init acpi_table_upgrade(void) data =3D __builtin_initramfs_start; size =3D __builtin_initramfs_size; } else { - data =3D (void *)initrd_start; - size =3D initrd_end - initrd_start; + data =3D (void *)virt_external_initramfs_start; + size =3D virt_external_initramfs_end - virt_external_initramfs_start; } =20 if (data =3D=3D NULL || size =3D=3D 0) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 9c4c9be948c5..baf8347e0314 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -765,8 +765,8 @@ static void __early_init_dt_declare_initrd(unsigned lon= g start, */ if (!IS_ENABLED(CONFIG_ARM64) && !(IS_ENABLED(CONFIG_RISCV) && IS_ENABLED(CONFIG_64BIT))) { - initrd_start =3D (unsigned long)__va(start); - initrd_end =3D (unsigned long)__va(end); + virt_external_initramfs_start =3D (unsigned long)__va(start); + virt_external_initramfs_end =3D (unsigned long)__va(end); initrd_below_start_ok =3D 1; } } diff --git a/include/linux/initrd.h b/include/linux/initrd.h index 23c08e88234c..f19efebe8221 100644 --- a/include/linux/initrd.h +++ b/include/linux/initrd.h @@ -3,10 +3,10 @@ #ifndef __LINUX_INITRD_H #define __LINUX_INITRD_H =20 -/* 1 if it is not an error if initrd_start < memory_start */ +/* 1 if it is not an error if virt_external_initramfs_start < memory_start= */ extern int initrd_below_start_ok; =20 -extern unsigned long initrd_start, initrd_end; +extern unsigned long virt_external_initramfs_start, virt_external_initramf= s_end; extern void free_initrd_mem(unsigned long, unsigned long); =20 #ifdef CONFIG_BLK_DEV_INITRD diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c index 06be76aa602c..8bdeb205a0cd 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c @@ -12,7 +12,7 @@ =20 #include "do_mounts.h" =20 -unsigned long initrd_start, initrd_end; +unsigned long virt_external_initramfs_start, virt_external_initramfs_end; int initrd_below_start_ok; =20 static int __init early_initrdmem(char *p) diff --git a/init/initramfs.c b/init/initramfs.c index 5242d851e839..9a221c713c60 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -611,7 +611,7 @@ void __init reserve_initrd_mem(void) unsigned long size; =20 /* Ignore the virtul address computed during device tree parsing */ - initrd_start =3D initrd_end =3D 0; + virt_external_initramfs_start =3D virt_external_initramfs_end =3D 0; =20 if (!phys_external_initramfs_size) return; @@ -639,15 +639,15 @@ void __init reserve_initrd_mem(void) =20 memblock_reserve(start, size); /* Now convert initrd to virtual addresses */ - initrd_start =3D (unsigned long)__va(phys_external_initramfs_start); - initrd_end =3D initrd_start + phys_external_initramfs_size; + virt_external_initramfs_start =3D (unsigned long)__va(phys_external_initr= amfs_start); + virt_external_initramfs_end =3D virt_external_initramfs_start + phys_exte= rnal_initramfs_size; initrd_below_start_ok =3D 1; =20 return; disable: pr_cont(" - disabling initrd\n"); - initrd_start =3D 0; - initrd_end =3D 0; + virt_external_initramfs_start =3D 0; + virt_external_initramfs_end =3D 0; } =20 void __weak __init free_initrd_mem(unsigned long start, unsigned long end) @@ -673,17 +673,17 @@ static bool __init kexec_free_initrd(void) * If the initrd region is overlapped with crashkernel reserved region, * free only memory that is not part of crashkernel region. */ - if (initrd_start >=3D crashk_end || initrd_end <=3D crashk_start) + if (virt_external_initramfs_start >=3D crashk_end || virt_external_initra= mfs_end <=3D crashk_start) return false; =20 /* * Initialize initrd memory region since the kexec boot does not do. */ - memset((void *)initrd_start, 0, initrd_end - initrd_start); - if (initrd_start < crashk_start) - free_initrd_mem(initrd_start, crashk_start); - if (initrd_end > crashk_end) - free_initrd_mem(crashk_end, initrd_end); + 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); + if (virt_external_initramfs_end > crashk_end) + free_initrd_mem(crashk_end, virt_external_initramfs_end); return true; } #else @@ -700,12 +700,12 @@ static void __init do_populate_rootfs(void *unused, a= sync_cookie_t cookie) if (err) panic_show_mem("%s", err); /* Failed to decompress INTERNAL initramfs */ =20 - if (!initrd_start || IS_ENABLED(CONFIG_INITRAMFS_FORCE)) + if (!virt_external_initramfs_start || IS_ENABLED(CONFIG_INITRAMFS_FORCE)) goto done; =20 printk(KERN_INFO "Unpacking initramfs...\n"); =20 - err =3D unpack_to_rootfs((char *)initrd_start, initrd_end - initrd_start); + err =3D unpack_to_rootfs((char *)virt_external_initramfs_start, virt_exte= rnal_initramfs_end - virt_external_initramfs_start); if (err) { printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err); } @@ -717,16 +717,16 @@ static void __init do_populate_rootfs(void *unused, a= sync_cookie_t cookie) * If the initrd region is overlapped with crashkernel reserved region, * free only memory that is not part of crashkernel region. */ - if (!do_retain_initrd && initrd_start && !kexec_free_initrd()) { - free_initrd_mem(initrd_start, initrd_end); - } else if (do_retain_initrd && initrd_start) { - bin_attr_initrd.size =3D initrd_end - initrd_start; - bin_attr_initrd.private =3D (void *)initrd_start; + if (!do_retain_initrd && virt_external_initramfs_start && !kexec_free_ini= trd()) { + free_initrd_mem(virt_external_initramfs_start, virt_external_initramfs_e= nd); + } else if (do_retain_initrd && virt_external_initramfs_start) { + bin_attr_initrd.size =3D virt_external_initramfs_end - virt_external_ini= tramfs_start; + bin_attr_initrd.private =3D (void *)virt_external_initramfs_start; if (sysfs_create_bin_file(firmware_kobj, &bin_attr_initrd)) pr_err("Failed to create initrd sysfs file"); } - initrd_start =3D 0; - initrd_end =3D 0; + virt_external_initramfs_start =3D 0; + virt_external_initramfs_end =3D 0; =20 init_flush_fput(); } diff --git a/init/main.c b/init/main.c index 0ee0ee7b7c2c..5f4d860ab72a 100644 --- a/init/main.c +++ b/init/main.c @@ -271,10 +271,10 @@ static void * __init get_boot_config_from_initrd(size= _t *_size) u32 *hdr; int i; =20 - if (!initrd_end) + if (!virt_external_initramfs_end) return NULL; =20 - data =3D (char *)initrd_end - BOOTCONFIG_MAGIC_LEN; + data =3D (char *)virt_external_initramfs_end - BOOTCONFIG_MAGIC_LEN; /* * Since Grub may align the size of initrd to 4, we must * check the preceding 3 bytes as well. @@ -292,9 +292,9 @@ static void * __init get_boot_config_from_initrd(size_t= *_size) csum =3D le32_to_cpu(hdr[1]); =20 data =3D ((void *)hdr) - size; - if ((unsigned long)data < initrd_start) { + if ((unsigned long)data < virt_external_initramfs_start) { pr_err("bootconfig size %d is greater than initrd size %ld\n", - size, initrd_end - initrd_start); + size, virt_external_initramfs_end - virt_external_initramfs_start); return NULL; } =20 @@ -304,7 +304,7 @@ static void * __init get_boot_config_from_initrd(size_t= *_size) } =20 /* Remove bootconfig from initramfs/initrd */ - initrd_end =3D (unsigned long)data; + virt_external_initramfs_end =3D (unsigned long)data; if (_size) *_size =3D size; =20 @@ -1047,12 +1047,12 @@ void start_kernel(void) locking_selftest(); =20 #ifdef CONFIG_BLK_DEV_INITRD - if (initrd_start && !initrd_below_start_ok && - page_to_pfn(virt_to_page((void *)initrd_start)) < min_low_pfn) { + if (virt_external_initramfs_start && !initrd_below_start_ok && + page_to_pfn(virt_to_page((void *)virt_external_initramfs_start)) < mi= n_low_pfn) { pr_crit("initrd overwritten (0x%08lx < 0x%08lx) - disabling it.\n", - page_to_pfn(virt_to_page((void *)initrd_start)), + page_to_pfn(virt_to_page((void *)virt_external_initramfs_start)), min_low_pfn); - initrd_start =3D 0; + virt_external_initramfs_start =3D 0; } #endif setup_per_cpu_pageset(); --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) (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 F3EF3195808 for ; Sat, 13 Sep 2025 01:11:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725909; cv=none; b=nVzGJF02Gse2ooquHQTPFKi/JLHyVgmySHaON4WswCV/AcPKjYIbbiktHl4wGGuSv2oJmjEH1ZQ4IXtt0wnG9ncE0FBfzsEgFNnek4IQqnotCiSzId9gBv1Z4r+Bjp1Z1H4qejTF8F4nJtxtC8u8O2Y1cQwVHINnagD2JNFl0s0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725909; c=relaxed/simple; bh=KpML4fn90471dg944P+9+9FByq3Xjb/jBBYn5xTeENA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ui+5OAcxgdWoeIxbOtkjOXoWdhs0UHH92iiigRnnNbhjs+nODm7Ul8AeFRMw5/ArVqkwFP85YOakx2tfW6BbhR5Hg3UqL3mw9Z0hgIgyyMtwFBkbciSUx/CsQikD1cBtgLR8c92HJvLEs8i9cSCx3LpyeUE/62w/URxhI6I8lDg= 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=aUORZv5M; arc=none smtp.client-ip=209.85.208.51 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="aUORZv5M" Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-61cb4374d2fso3680349a12.2 for ; Fri, 12 Sep 2025 18:11:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757725904; x=1758330704; 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=h6O+lfSZLBCLtFpNKL/1anVub0eApVizJE0pmHD2kMo=; b=aUORZv5MCUdwsV0MU7oCzj3ZTm7w3ESOPYBigQlqMxPsAavMDyHGJgEYQWATfs3+b/ biPBcBrCE9URVMoH0rqHehw0T1BRhiZjlA9durZSP0yEkzERpopJvyeRh9qFGG5oSCsQ OuIa430sEthMDEkIZDIQQAO65i2svbWCQtUDobiF+pJzf/eh+f2Qg9BVDr0XDXs5AJy7 S+eE8Bk/nYgSsoMihCGJb0SQb6wVy+gefAADkk7B44V5PV1ioyXUHisNSxZuDoeNZtpw pk7wtMp9HCPO+M4hoY912LuHIIjWkZVXjLrL7AKM6klm1vtlLotKzYFANlld9p+SFPzp US6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757725904; x=1758330704; 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=h6O+lfSZLBCLtFpNKL/1anVub0eApVizJE0pmHD2kMo=; b=Gav7Al3F7yfm53okTVn7YvFNpRGVCyKbRBqkmnOIx9Ifa2F42xLn4DPIEzO/MQBRK0 xW3CgVOjwRFpcHxFqh6eEalSyLbl+92NnHXiNl1aZVwxKuwAhjexkgUexHw/JvEpRiaQ KLBb1DVpacjqDFNVt7ocdk1xjDAurAbAc4a2TJAVcamhsJI2DQjkwqwztZrKsoUtJL79 nMpaHxHOQwO3uXObvNneuf4cScgptFBGPI/5/xqqS1hzi3TUHmXHD3ogDL8wrpn6JtGO c/X3q70NrHiAoza/jgdi1UYoOatC4PZigLjotvbKXde8+eThwdzOqwU91RJPICA5aMF8 yKdQ== X-Forwarded-Encrypted: i=1; AJvYcCW6ciuoTPm0zQ5sdyyJHE08fjM64IK8GbMigutJbZJi3coP0YhTAJ9u9X84X/3+49WEK6Jl/Dt+Qhvp1K8=@vger.kernel.org X-Gm-Message-State: AOJu0YxRIYFoaGQ3gvvOBHsTjQ0NVztcSFikeyPlOgRxwWTgWelWl+eW JwzFRmuCrdKWWMyRPJZYjE1udS3qT1Oqo17QvfAbyXU+1tffAYiLv7Zq X-Gm-Gg: ASbGncuQcAom3g6JXLrefclMk/Fg6nXVucDr+K+vkjsxcI+9Eb4CFPgH06XsVm3EWyy VrmXP++E3cK6PXSBraLN6MzcETDa9tF+R+I4LOAO8M3ZySAhEczFm1+dDIHdYlWaaC1JNgqmOf8 hxI05kBNtK9K1HGgNb/WkdzpYO22czo9wNYZ7k+0B2IKHPvBppMiylhFvyF4nkrefXeujsMQX+g mfGxzzqi0kZU6dukLUYNXYoTMQg9JKGLuqANOtxg8pBaT+p7APC1qhu/F7CS+knjTm4CH7GEO9S v6uBbFrM5eFJflVhLcO08rxVALLtDLHKv8hQIX873g2gXkY+U3F/koRYQy4IfcwQe2oKQsuHhrl AQ12zALo0u2OIbkgF840= X-Google-Smtp-Source: AGHT+IEEs4w0VYWOrTZ2mf5mPdRdgIBBMsi5zMJEle+Jt2EK6Q+4TbCNWtdbvmdxcJfUUMXxxDwLfQ== X-Received: by 2002:a05:6402:5242:b0:628:a4fb:3b44 with SMTP id 4fb4d7f45d1cf-62ed825998fmr4990182a12.1.1757725904210; Fri, 12 Sep 2025 18:11:44 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id 4fb4d7f45d1cf-62efb5b8b0asm913566a12.20.2025.09.12.18.11.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 18:11: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 29/62] init: move virt_external_initramfs_{start,end} to init/initramfs.c Date: Sat, 13 Sep 2025 00:38:08 +0000 Message-ID: <20250913003842.41944-30-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move definitions of virt_external_initramfs_start and virt_external_initramfs_end to init/initramfs.c Signed-off-by: Askar Safin --- init/do_mounts_initrd.c | 1 - init/initramfs.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c index 8bdeb205a0cd..535ce459ab94 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c @@ -12,7 +12,6 @@ =20 #include "do_mounts.h" =20 -unsigned long virt_external_initramfs_start, virt_external_initramfs_end; int initrd_below_start_ok; =20 static int __init early_initrdmem(char *p) diff --git a/init/initramfs.c b/init/initramfs.c index 9a221c713c60..d2301cc6c470 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -600,6 +600,8 @@ __setup("initramfs_async=3D", initramfs_async_setup); #include #include =20 +unsigned long virt_external_initramfs_start, virt_external_initramfs_end; + phys_addr_t phys_external_initramfs_start __initdata; unsigned long phys_external_initramfs_size __initdata; =20 --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (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 7C48119AD5C for ; Sat, 13 Sep 2025 01:12:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725976; cv=none; b=ARIaK5RUljwoCHs1PlCvTtEaJanAxQXaiaz6N7XYly5EYCW8Esb6LqSRj8ombcJHBPksGxJnW6wSLhZvEn+fb9zq3iguMSddhhnIIBXwTo8xpS4g/o5KMKRfQprmRvA3JodxO4t4J1ytYEd1MQVmrKSuxBlo3eykJnYKnq1gMMQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725976; c=relaxed/simple; bh=5w1rh0L6NznGkqOB1ptiKwAFOGZfY5CoA2D4m8g2/Jc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ua55qeCwc8oSB8BUSzDO7g3o5cDHCyBdj2xyvRrxrXREIYYSPAnGCieIiNSeUtHJyfUDvFtinhLRkvZiiEPowVOiMgpTh1F/fQcqSQyzlUQyq2jDlAz97Rob+GhYiMS0pELRVGhiKgi/UlBzBZG909H0UtG9chciB8m12+6HvFY= 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=jm9piSCy; arc=none smtp.client-ip=209.85.218.43 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="jm9piSCy" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-afcb7a16441so374602266b.2 for ; Fri, 12 Sep 2025 18:12:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757725970; x=1758330770; 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=CPS175BLdkdbkMvPyh09bMwfY79gXnuJYPms+9/x8xc=; b=jm9piSCyAtXZ4sW7o/h3SGpliQHevBkrhxl1tQii9mgHqdG87o74LcSjtY0avpY0iX RdeiQDrUqQ5C5qyGy2HNHbhjeW1tyThLcjGIFDuhifBp9ZAahZRe/JcjT78TZLjYxr6O clz08Pl2eYNgCRP3z65VvP8bCDfsGkCIvdvYFwno6M8/UvygM+KRsZjpRUrxOekYWGnI j0/O25Qolp3eD7BmcFGNh8/jP3xJV+WM11QZFpJ3kUVpHKMxijbTHMgjsau/ncgLiR1/ GlkR/1ri7/XijIi7U6mEk94bP2JEKshCIzyPHHSsIIuiNpAyZbMwdpQELhiCIBLbGIjK LxNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757725970; x=1758330770; 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=CPS175BLdkdbkMvPyh09bMwfY79gXnuJYPms+9/x8xc=; b=e7z+R/G831yZMyncVMcKq7+a9xn67A2+2HTJzIBekrBUp0zLuBmYIVv1ucN+vpj1yI oOACzvjAYUzz4Xk/Hsbqbh2aoqckvdDpDs4bHNmkU20dRJpRUYdqBKSJ0Z3ETN4TsP5C 9X0olIUFmY9PLpDMiS7EojVdW6M1dI5tCMmg8pzLMdKRK6ETUNJyAbY05CJoRQgVS/DO qF0l7mMqokOX3CJj3jnJNLxrtk/MVYFDliraP7NlcJGfym3L3a0bkjxWHuiiyYIglW0I Y4R7B5cZxat2urx3V9IRbWk1YY73RCZBLOcv6r5x9NIva5kNsThec73h+wdkLvtRKij7 LgrA== X-Forwarded-Encrypted: i=1; AJvYcCW9JgsgD/VZbCcItuVM+/6bxMqWHuv0LjVn9jfVQ/IyFYoK2v67bCBTSYn/9SD7zIAmJxLlSg7bir6Y0IA=@vger.kernel.org X-Gm-Message-State: AOJu0YyrYpm8pDBhVLyZBz3zIomafsEokgPD3/bQkhI7ubf1tALaj7Qa j5P0070UONYkr8d589lalOBDGN1l1isKL6DrRFdFVMLKPFbgTigPcMPP X-Gm-Gg: ASbGncvfjeViSbaVlpOHqu7aI1++p0hJySY5rDy5TYqlt8YkYKafTc36/yrjFWiX5ww oVqNx8ZCprJvzi/BVxt6UG1rE/m+E+Ngq5awNCSwyaTg+xPBO52ktNADoXaObQWvAVcXMP+sz2y GGuFpAg4x913uvfX+NCCvTgYYUhy0gNEIf3aBqHzeu1Ml3ctuccj+Nnis1OBVF+ll20MMeM18hd 91wYexAAIsG8AckH9+Q+uaCVTPMGV1aWxX4OJVTuuymVU5zR9++nQvLyXaog69xq72ogQhkN24f o2Pq+jGZu85tqV5Sn8H94CcGybc9LmTwg0oWfP+geGIwD6Aey6eaxwIu5tJhaJ6/OcODJQFjNZr CAfxtyIrJpfusP3xAb3QqvI0ZCFqfO7L8H31Z6tfm X-Google-Smtp-Source: AGHT+IExCbHobezsJZBylPatDCb3rXiTmvHjuHynF55nxxCc14bpP2oPLB71sx+Li40Hkl4GjqRelQ== X-Received: by 2002:a17:907:97d2:b0:b04:31c6:a434 with SMTP id a640c23a62f3a-b07c324cf12mr467235966b.0.1757725969783; Fri, 12 Sep 2025 18:12:49 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b30da327sm479612566b.11.2025.09.12.18.12.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 18:12:49 -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 30/62] doc: remove documentation for block device 4 0 Date: Sat, 13 Sep 2025 00:38:09 +0000 Message-ID: <20250913003842.41944-31-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It doesn't work. I tested this both in system booted using initramfs and in system booted from real root device directly Signed-off-by: Askar Safin --- Documentation/admin-guide/devices.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Documentation/admin-guide/devices.txt b/Documentation/admin-gu= ide/devices.txt index 27835389ca49..6ce0940233a8 100644 --- a/Documentation/admin-guide/devices.txt +++ b/Documentation/admin-guide/devices.txt @@ -138,12 +138,6 @@ number for BSD PTY devices. As of Linux 2.1.115, this is no longer supported. Use major numbers 2 and 3. =20 - 4 block Aliases for dynamically allocated major devices to be used - when its not possible to create the real device nodes - because the root filesystem is mounted read-only. - - 0 =3D /dev/root - 5 char Alternate TTY devices 0 =3D /dev/tty Current TTY device 1 =3D /dev/console System console --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) (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 36810199949 for ; Sat, 13 Sep 2025 01:14:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757726046; cv=none; b=lE5rgih1Banbsk8aUpEu8zu6f8ttc0OBQddDTFlSHxLdHBGDpxrECEKtvlh/V6VbpZrnkNMh+tn+4iV59WCufRYQuf1XBk101lsaCFUoR4Fmi+0+U9wWWruaE0GnkObSMwo+gU9+Mj76fIwdElqD/S8Y+pOGE6h902lB08nH7D0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757726046; c=relaxed/simple; bh=62K0YkfDdlhI1a+nelUifSqHM+TzXEz2TygIEqrA7f8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bZroMu5b3fkHBsP6LeuWK+G5AFPkS45yRkAGFD0xlAsniVIIgsJe7n6tQ1EnISGrvXIwM443/8LS8W9SF42rGvVrd+nRcOWzGI5HlwHEKPAYOfzo4y4RnhPZVdFQxyTso63OiunsA6/BCHyrqnPYnPp/S9DLwPUvbt3REBfWc6M= 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=mgL7/8Ot; arc=none smtp.client-ip=209.85.218.47 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="mgL7/8Ot" Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-b07e3a77b72so31721666b.0 for ; Fri, 12 Sep 2025 18:14:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757726040; x=1758330840; 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=XKplWAnltyYUA7miE90Ca2CY8VaXOWztn2OaioKTh7Y=; b=mgL7/8Ot4tslwTLXLJnn8ZN1WtZ81gcffeEwJlFjWvuiAaeXt6TWrC8zXcznklloFx uE04x/bEwXwHTi33IoBatcHEkHmwD2lXwHM76H6eu2Xh1l/x1EAVoEO+8JX5l8MhNv8n USYETvfIejgX9IzNh2ST92so6AfJ4/BdCUptwe/i+bEZj7a9xh27o675U/tYo/otEsXL CUlyxdSb4RYP4422AH59ACMRmaf7Q7JLQKbkjiHhmQuhOVaEFCF9Vacgpi9YIR3H4I+q 0oqgWtIpnPKmzuO6LN9UOHdI/2W8w5t3SwQiUEMa6lMs9rFfyZYLLNvOGvjrZDDyCXC8 i1yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757726041; x=1758330841; 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=XKplWAnltyYUA7miE90Ca2CY8VaXOWztn2OaioKTh7Y=; b=P2x4F38TzDxWWeVIty03pLX/jMq0D0c//AnL9u2Kea0kIgLQNuGxBZnrMOM1Dkf/N0 twOvbdIi8wTY1+o1mjlVhffUmxdigNzw18zxb187G6BGzLa2zd2JTTHrjkjU15kFks/Q gRMvgTPgNpy6bFY8rCByW/Yt8r5rwcBUW5LZ5hmSmUQd6GdZKEd0liCxC/nRFf1TDNYp t/5Jp6nO7D5UsuUl9my+iXizN7urYSQqZIg4fECha/nnsXTCyIzynB1fLTP2sIbJXZg1 jUgskUNkENQ5zKo+s1NswhZGXyVP+NK94wrkv8fBq6wpKeWywwzfHF05CT1fGkKX1uAN Q8Xg== X-Forwarded-Encrypted: i=1; AJvYcCX3kPVrDQF2c2K2Dcr4GqUwfi8Sbnrq+6QXXNLOvu03Lp4fHopNk1nT4Z/VG5K0vpkBzr5Dj2DIWY6V4Cg=@vger.kernel.org X-Gm-Message-State: AOJu0YxbMUPw9EFe4q3eBT32LM4Ln5ZgZJ8fIKnKgIYllPw8SL+Wkq+D 2RAmJJ6kDK9R/0Go+aJLieXJ7JKLm+EnxfWreVkqLZ44oTfWmPR1jpva X-Gm-Gg: ASbGncutdnf2mxoYJ+sALU0TQPBGNBCIbee2+QONMGpadUZpamXRvMacaawf5HcPoPW l0iaXekTstuw23NK66y2F/jf4Sug5zZYuJKuF6eiCAb2FHZHf0/3aFEY2KM4WXI0Rz8XYsnmXXx rb7uLEiY1TjPyECN01yXWPkmXmYMopzEHbBA7H0NmyB/SUdJb6+IRpN36oOEIRCrjs6KawyWtuR +NhssJmAqhlAOFcTvCVHZsbwWDQxhqJQfHNjShmsw0FV0SngLRkzb0smvWxEtACA61qI90vwBzp N7GuQzvpoXF3wGOcrJgim6MDsoj3QtoEPMZG6LmKqonCeXLjOq5sySlNHSCZIhLoBALtxGYiH5z fOA6lXYJ12f3WAWh9dtg= X-Google-Smtp-Source: AGHT+IEnK8aPf5G48k9Kvznzx9z/ncVW6jv1PE49Xay12m4larnapJ0sjzKIoAPfuRHHNKc71/ZXZg== X-Received: by 2002:a17:907:86a7:b0:afe:8420:1152 with SMTP id a640c23a62f3a-b07a6490897mr877727966b.18.1757726040472; Fri, 12 Sep 2025 18:14:00 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b3128a1esm461508066b.29.2025.09.12.18.13.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 18:13:59 -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 31/62] init: rename initrd_below_start_ok to initramfs_below_start_ok Date: Sat, 13 Sep 2025 00:38:10 +0000 Message-ID: <20250913003842.41944-32-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It refers to initramfs, not to initrd Signed-off-by: Askar Safin --- arch/csky/kernel/setup.c | 2 +- arch/mips/kernel/setup.c | 2 +- arch/openrisc/kernel/setup.c | 2 +- arch/parisc/mm/init.c | 2 +- arch/xtensa/kernel/setup.c | 4 ++-- drivers/of/fdt.c | 2 +- include/linux/initrd.h | 2 +- init/do_mounts_initrd.c | 2 +- init/initramfs.c | 2 +- init/main.c | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/csky/kernel/setup.c b/arch/csky/kernel/setup.c index ce128888462e..403a977b8c1f 100644 --- a/arch/csky/kernel/setup.c +++ b/arch/csky/kernel/setup.c @@ -40,7 +40,7 @@ static void __init setup_initrd(void) pr_info("Initial ramdisk at: 0x%p (%lu bytes)\n", (void *)(virt_external_initramfs_start), size); =20 - initrd_below_start_ok =3D 1; + initramfs_below_start_ok =3D 1; =20 return; =20 diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index da11ae875539..aed454ebd751 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -225,7 +225,7 @@ static void __init finalize_initrd(void) maybe_bswap_initrd(); =20 memblock_reserve(__pa(virt_external_initramfs_start), size); - initrd_below_start_ok =3D 1; + initramfs_below_start_ok =3D 1; =20 pr_info("Initial ramdisk at: 0x%lx (%lu bytes)\n", virt_external_initramfs_start, size); diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c index f387dc57ec35..337a0381c452 100644 --- a/arch/openrisc/kernel/setup.c +++ b/arch/openrisc/kernel/setup.c @@ -246,7 +246,7 @@ void __init setup_arch(char **cmdline_p) } else { printk(KERN_INFO "Initial ramdisk at: 0x%p (%lu bytes)\n", (void *)(virt_external_initramfs_start), virt_external_initramfs_= end - virt_external_initramfs_start); - initrd_below_start_ok =3D 1; + initramfs_below_start_ok =3D 1; } #endif =20 diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index 74bfe9797589..af7a33c8bd31 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c @@ -308,7 +308,7 @@ static void __init setup_bootmem(void) } else { initrd_reserve =3D virt_external_initramfs_end - virt_external_initram= fs_start; } - initrd_below_start_ok =3D 1; + initramfs_below_start_ok =3D 1; printk(KERN_INFO "initrd: reserving %08lx-%08lx (mem_max %08lx)\n", __p= a(virt_external_initramfs_start), __pa(virt_external_initramfs_start) + ini= trd_reserve, mem_max); =20 memblock_reserve(__pa(virt_external_initramfs_start), initrd_reserve); diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 2e9003be3e8c..b86367178bce 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -51,7 +51,7 @@ #ifdef CONFIG_BLK_DEV_INITRD extern unsigned long virt_external_initramfs_start; extern unsigned long virt_external_initramfs_end; -extern int initrd_below_start_ok; +extern int initramfs_below_start_ok; #endif =20 #ifdef CONFIG_USE_OF @@ -292,7 +292,7 @@ void __init setup_arch(char **cmdline_p) #ifdef CONFIG_BLK_DEV_INITRD if (virt_external_initramfs_start < virt_external_initramfs_end && !mem_reserve(__pa(virt_external_initramfs_start), __pa(virt_external_= initramfs_end))) - initrd_below_start_ok =3D 1; + initramfs_below_start_ok =3D 1; else virt_external_initramfs_start =3D 0; #endif diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index baf8347e0314..127b37f211cb 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -767,7 +767,7 @@ static void __early_init_dt_declare_initrd(unsigned lon= g start, !(IS_ENABLED(CONFIG_RISCV) && IS_ENABLED(CONFIG_64BIT))) { virt_external_initramfs_start =3D (unsigned long)__va(start); virt_external_initramfs_end =3D (unsigned long)__va(end); - initrd_below_start_ok =3D 1; + initramfs_below_start_ok =3D 1; } } =20 diff --git a/include/linux/initrd.h b/include/linux/initrd.h index f19efebe8221..364b603215ac 100644 --- a/include/linux/initrd.h +++ b/include/linux/initrd.h @@ -4,7 +4,7 @@ #define __LINUX_INITRD_H =20 /* 1 if it is not an error if virt_external_initramfs_start < memory_start= */ -extern int initrd_below_start_ok; +extern int initramfs_below_start_ok; =20 extern unsigned long virt_external_initramfs_start, virt_external_initramf= s_end; extern void free_initrd_mem(unsigned long, unsigned long); diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c index 535ce459ab94..d8b809ced11b 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c @@ -12,7 +12,7 @@ =20 #include "do_mounts.h" =20 -int initrd_below_start_ok; +int initramfs_below_start_ok; =20 static int __init early_initrdmem(char *p) { diff --git a/init/initramfs.c b/init/initramfs.c index d2301cc6c470..a9c5d211665d 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -643,7 +643,7 @@ void __init reserve_initrd_mem(void) /* Now convert initrd to virtual addresses */ virt_external_initramfs_start =3D (unsigned long)__va(phys_external_initr= amfs_start); virt_external_initramfs_end =3D virt_external_initramfs_start + phys_exte= rnal_initramfs_size; - initrd_below_start_ok =3D 1; + initramfs_below_start_ok =3D 1; =20 return; disable: diff --git a/init/main.c b/init/main.c index 5f4d860ab72a..58a7199c81f7 100644 --- a/init/main.c +++ b/init/main.c @@ -1047,7 +1047,7 @@ void start_kernel(void) locking_selftest(); =20 #ifdef CONFIG_BLK_DEV_INITRD - if (virt_external_initramfs_start && !initrd_below_start_ok && + if (virt_external_initramfs_start && !initramfs_below_start_ok && page_to_pfn(virt_to_page((void *)virt_external_initramfs_start)) < mi= n_low_pfn) { pr_crit("initrd overwritten (0x%08lx < 0x%08lx) - disabling it.\n", page_to_pfn(virt_to_page((void *)virt_external_initramfs_start)), --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) (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 C07C41A2C04 for ; Sat, 13 Sep 2025 01:15:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757726111; cv=none; b=Kosr3DIXjRZ7S5nVhfWMTiIy3Koux6fn1NkRykj1C8i9C5QG6D40dcapTaKRAqzMvpFHnoQaHB0lBoFAduQkrVqY6No+kZsGdvlRLmKWATxYhecI5wthJ+EI+c44kLJkzVg6ZXqEbnfQDDi5qAXrSExtL7d88G1axvUJoJNzrTI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757726111; c=relaxed/simple; bh=YCPpMauct/lx0d7FW5hIc0XQ6n2+DOQok3eBS/uAsZQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Jj0+9dEG+EPL6jFgfqyIqCPWEmEXERW0xMFDPx0izQxDURakxol+H4G5onqnfXLp3etju+YQ1jJ+M7De8kmtUlf7IX3ffQkmSmv02a5Q6Zn6dIkb9aAExrtlbYiuRJKtiJuYzgSdtwcPunBaiKKkGJJEaw4yG4NdnakXO5ENfNM= 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=VKbvefFf; arc=none smtp.client-ip=209.85.218.47 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="VKbvefFf" Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-b07e3a77b72so31768766b.0 for ; Fri, 12 Sep 2025 18:15:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757726106; x=1758330906; 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=OGsRGTypi9NqdtciySRZZEpkGgKS+BdOkJag/Ax3VcI=; b=VKbvefFf6JBv8ek67wEer0RqEYwiljoVukI7dIf37vTbdwK1pUDhIfMM3hyeTN6/rL +1tAIenyQG8OqtZbzMV84BPV5G1aCWIv8OKsTJdJCmdh8ibEuPlEt02Wr6PDdRhds8lK 36BYIjOUazY9M4I/TbvOKS7ix9db1AJlvb5AIqciXeanKK2+T7Qz06EPR7eVVqWzdFIt 55yW7b9cBiZDy/PaCCDOvTFq3VdctKrn0CCpd+aBZ3B04KsgueUe5rfniJ084iwg3uUj SYQehXknTBTUmNRmTROPG26td7Qj9x6WVquBc1EaiO4Lfi2lj6ZlCNjqKeme/nh0bOah Va4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757726106; x=1758330906; 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=OGsRGTypi9NqdtciySRZZEpkGgKS+BdOkJag/Ax3VcI=; b=Ym4UsGQHyh/Sb9atZlw/MRNQ31DSh4ZTJj6FNq8x/AsSWzfhXgabpR+im9GqOCEBRM NK1uqaPUNlYEVNDeK0pq21N5rZ+r0/kZsrNVYSqBbRlelblzAJTv0Xcmr+TAyy/ZTMO6 Sd7PR0RTVYLzncKnog46S2tiAbta8SA8o9durTUjTnnTI5rSN4QJVoTBOo5G+wD8e9+/ zpjigwlajwNwZW/y0FdmvVN8J1oQtJXc9JELL2pCCan5RPQPGFdskJZQxKbtpoNMtuRP LjT2KW3iJWLLb4dtmAD3nS9uQOLz06j3SRYzHITFmo2lUghbGkQdhAfowmaxL1T13YPt dSpg== X-Forwarded-Encrypted: i=1; AJvYcCU3I97PkDGSiTJGf8jVdfKWjUax492O4971CuIqwmbcKM1oa+e1O4aWBRQKTXzFWQdNcBgog0GeaGM7uUE=@vger.kernel.org X-Gm-Message-State: AOJu0YxqbL7vMk/Km6uBvCQsrCopz41yehXfw3h/NJ4FS15t62Zr1NqD 7vJmnrngBjGay/leFfxN7/Zsu1kLcAt7RRPRBYuOEX3tlW5Prr3X7GPr X-Gm-Gg: ASbGncvA+eFpuNTpAoU92zTBPZBtJjEd+5WTJ5u/XoEwDtw2hlBoOcdhXntawBS9ApB 7jxI95bEi8832pNW2Mf5orQBVBDUItZD2wsUqXwud4mB2qOwqhOI8tpeo9QzWYTFyNx/RH3sO7G FzcboaauR3nJ/b0f/R+8dsXJnbmgpi+2ZDJm4aEVb/L3/d4EzxlMwcJBGV8M+64MlOXkcZvg+CY 2IlrHHNTtumXCPkwbUYx6d3IzrbY0o8LpbjXWOBTWlsMB7ro4rH1UqrITomFAGiIXb+shMITt07 JffQV/GuCBLlR2k8RGI1Rz6myA8eTc/hVK+kEDmHK3vqVEnv+Bsk7OzaGy7KXddCKw5AThePwg5 Hn1itVVKrVuIk6yrElZA= X-Google-Smtp-Source: AGHT+IF9BfFXzJCfAH1j6Whgn4db4w3JHUdrGBSr/SBtjDaVKK8KXKnwXgawQKNvW2//sA4Wp0ETBg== X-Received: by 2002:a17:906:794f:b0:b07:b19c:1389 with SMTP id a640c23a62f3a-b07c2543931mr499914966b.23.1757726105874; Fri, 12 Sep 2025 18:15:05 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b334e4fesm475799966b.106.2025.09.12.18.15.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 18:15:05 -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 32/62] init: move initramfs_below_start_ok to init/initramfs.c Date: Sat, 13 Sep 2025 00:38:11 +0000 Message-ID: <20250913003842.41944-33-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is cleanup after initrd removal Signed-off-by: Askar Safin --- init/do_mounts_initrd.c | 2 -- init/initramfs.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c index d8b809ced11b..509f912c0fce 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c @@ -12,8 +12,6 @@ =20 #include "do_mounts.h" =20 -int initramfs_below_start_ok; - static int __init early_initrdmem(char *p) { phys_addr_t start; diff --git a/init/initramfs.c b/init/initramfs.c index a9c5d211665d..90096177a867 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -601,6 +601,7 @@ __setup("initramfs_async=3D", initramfs_async_setup); #include =20 unsigned long virt_external_initramfs_start, virt_external_initramfs_end; +int initramfs_below_start_ok; =20 phys_addr_t phys_external_initramfs_start __initdata; unsigned long phys_external_initramfs_size __initdata; --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (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 AFC441F16B for ; Sat, 13 Sep 2025 01:16:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757726176; cv=none; b=Sv+4U+V20XKcwLNVVIZuGu0OzPm3ZjzUdTFPdY3SSXxJqh/s778AmhRY58xW2klCAGp5eP29u1lQzACefkiO7/vCkkcfpoYroj9DWXx0AHAEvPK7q9zXxsEF1+4D9EuAHe5Z7mqGXMDaNqRmMOufHQvOmFLYmQ6v7w8WKGupo+E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757726176; c=relaxed/simple; bh=EiIsazq+8AAIxPXReMMvw7uV4x0thFYUO8UTXtaH2NM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=drcZEJedn8XVmiOQuD/POyq6PFqzLn+otJno7FzJESLzUCo3NUWSPZ5mYcItvrq9AyKMsrm8XbMu8FuhuRZTVjZeODPi/2RfWmLiUEQRQAQg0zCo+5/HeG9JpGyvPNfXa3xhvaCCjF4+rqSyRE9s4AG0q4X+/GVzxSIOJxHW8MU= 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.46 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-f46.google.com with SMTP id 4fb4d7f45d1cf-6228de280a4so4102057a12.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=PVo0DAeJumkPlrCoK2TPX7aciFxtFzU2pXaMHGmOswxsYapmB/MY5jXh4ctq+6jFIG 7RUZMDTT3gK/peeHQ4wB3zl/r+EvRBodK+4zzFC3VDVyEVM6amGL1O2gEYWAP8yXDYaD QMSItmiUcjLC1uXQ1wuLaxBfTIbr7H1rblCHgrCT+jVZ4fIFD+N3ZxPqIkwmdLD67eRM JkxNKzTEQtpzfEiXdaHe9T7cnXHw4+MdgD7AgEMCtxZYP4RMUrkSOcOK/wpxe8XuW66r HtPNJ9xYV3N3ug2xOWKl2o6z1Ievo2VCKiOF5Ve2QUCObmAm98978fM0M10SCpU181pg rfbA== X-Forwarded-Encrypted: i=1; AJvYcCVGzHENrQdb26C2UM5cvtt2nIVtOB8Ux/euuYHR4VPix/M1LWi5BoWzZzJFe5whIvFwTnzVDeomvoVDKTA=@vger.kernel.org X-Gm-Message-State: AOJu0YxHppLsS8N9WKo6gmnc8YllHM/6rWVE4qzZiDZ91zkPRIoKYzKE LmuW55lvUK9BqUjRWMKp0kZ65EZ0JNMYCZxMi+Cx08/QlvzGRKXENq0vbODi0ZtN X-Gm-Gg: ASbGncujY/fSd1e2kPKTJgXOJH8bLrvU5n6YffmWx0sbmKOF1X1MyJFm8FZArm+t5Jj VWJTnoahhUpzEytrXIwzRCeJeUBNj/UtEwWI4CYeH0KDi3BNNrA+WukZQR2ufoqPK33VXScGzEl ENfNGBX5gRtGwW38DlwUVKEhU2l7BrYl50zcki2uEBAqrJIGTUqvvg8nperR/d/rBXNGVj4H9l8 mjlHdEnv4Dc2VMFFQG8s+fCNVJfZbfqICn9gcKXv6aNnU18Iemi1WVmnEw+pV0bNvnq5oTxFb2D mwY9a9R2VFCFUpTW82EohzPxyzQZ5kfmO9/TgX4cI0nozF2hukA3SStPSa5tnvczt6wu9hkZ3Vc fhmgWpolmCAzEEFS06SMYLj5Hqqdn6A== 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: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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) +=3D initramfs_test.o obj-y +=3D init_task.o =20 mounts-y :=3D do_mounts.o -mounts-$(CONFIG_BLK_DEV_INITRD) +=3D do_mounts_initrd.o =20 # # 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 =3D memparse(p, &endp); - if (*endp =3D=3D ',') { - size =3D memparse(endp + 1, NULL); - - phys_external_initramfs_start =3D start; - phys_external_initramfs_size =3D 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; =20 +static int __init early_initrdmem(char *p) +{ + phys_addr_t start; + unsigned long size; + char *endp; + + start =3D memparse(p, &endp); + if (*endp =3D=3D ',') { + size =3D memparse(endp + 1, NULL); + + phys_external_initramfs_start =3D start; + phys_external_initramfs_size =3D 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); =20 void __init reserve_initrd_mem(void) --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) (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 49D1E1A83FB for ; Sat, 13 Sep 2025 01:17:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757726244; cv=none; b=pVOdxeoNJinOvt9UAraLFZlKOZk7QTsAoWZHW65A90b+GYtnu9vA21aYp9FWj5ucxWCs+sYyy+WNCO79B8/VgpOH2duPl2aM0aHyfrRFW7Tz7WKpHjb4qqwIeWPo+UcHE5T//t5VcIoHqfrqbeud+Hp/H7/xLFwGFnN5jGo8PiQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757726244; c=relaxed/simple; bh=oyncyjaLrzPFmjkp22Lh+fbFcypfHWy3Ry54UY3bgvQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f7rlGBcl5uwmThitMBMGYBQDaFxj3O1W87RkwnFjR3JSNtXlee+uy82ysPtifKJFFF6SyMLJRGcEH49SkzfX5YqKNYqyyyXCJLoVjwg7KTCuHhPK5v67kcDQLmRKG4a3hnb4WuU/ioGlxPHzMe9tFlADOTY3gfTKjckrroAq3ro= 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=Pv5lVuwm; arc=none smtp.client-ip=209.85.208.51 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="Pv5lVuwm" Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-62f0411577aso390366a12.1 for ; Fri, 12 Sep 2025 18:17:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757726239; x=1758331039; 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=lOKK4KIFki64V1O84ArLWA6Jx4UbLCdmK3IY8vRFz3o=; b=Pv5lVuwmVb5A8vNQP8+HTcG/JgQvDNSyP9WS6Bca1yZ7KNsWhFziOeULa55atldY8v xj7Ai8Wmr/W6iL+W+mDt0GJS58nDidso1Mc38FmXi35Hf9jI+c0BL/Rd5EpegbsT2FdL 55imZcS1IHqYhRK8jy8fZXpkI1mp6pAi1A+6/sV3NjUm7xiFGPNuneK/9yErFJuxrGMJ NBxBg+gDyDJBszFRnyIWgZwc41qHM5oIWs5Qi1iOybheqkYijpll13+0q/V36vZC06Ef hWwsXstOJNXnY9cLrmXFxjFFhB/kqi+EAKFk+lKJWvxdct1z5kmzB2Q1dWF8nVWydKjL K9BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757726239; x=1758331039; 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=lOKK4KIFki64V1O84ArLWA6Jx4UbLCdmK3IY8vRFz3o=; b=dTGiATTEwRrEJpYKMsgUUfw757xHvWZKzWsGK3kSuxtdYUAZuKBS0iyWC5a+MPRhxB TAqjbSr1vy1r1r1k2xTkt9BXvZDqpju7q5FiVXR2eZsbAXwS/DebkGmGXIiIL0PrDAG+ mxGYn1PRVniTIYHtvXpP1FPlUAQJPWfa1Y7vJVqhEKLuxjwzzeEFBC/AnpwafkfLltdx 2MRmOJH37EEy6haC0RY7BWS5CXWrG0PfTx4Mnt2YJyXaQYvOw89/FzcPmsL1OMoEN51r dBT07XFujiSAVcQ58c4ptoQcQZwisl0qbhdlHAOTLv4jX8yDJpv6cUWMrU/Do+iCiIyq GpTw== X-Forwarded-Encrypted: i=1; AJvYcCWc/cb40KSAGorvY1xhkEVdN+2LevfshbeZh8tGMvAksf2k5YQwc0RL6pjzJWzsUHM3YvVFMKJ5/IKL/QY=@vger.kernel.org X-Gm-Message-State: AOJu0YwAhN06bARAABnktxvdL1xnujvKT2P0BORE2pR+lz94AE541gx3 TBVMYgvaco/Q+0aWJkuHYiVLQWEg13F+zhl5bMYZNhW6hVGenvn/uvmo X-Gm-Gg: ASbGncsVDf5gq4Gf2BOpICe7e2k8FMqwIaZIVBcpMSCcCNfLMT0AhWAi4CSlhW4D/DZ edTmJz4kpv2IdVWhfYW2SXPOZ39rfUwypZujkSpwHnJonBUKvUjpEzGM5BOiL0tvOOwQrqkRy+z T04/2/fM9sTcKI2USyAWiCwGsOmTyFy0xeIB3VUNWIC90BYclN03M5vG4NFvNcSY2uFvvAaWD6e sI0YA57QZaTWWuL/FR6y8SjdtCfcW2wTmrRxh4Vvv2uYgKUTvvoWhrm3qkEZIwejALshdirXKv0 uvbBOBhEsyN2pLVtt4YnEdqN1Yoyzz9k3tRBvjWa59LeCuqiu0YE15+Y9v+KLU/m6PYnl0k8iAf IijY8jHeT9etGs+fqFBM= X-Google-Smtp-Source: AGHT+IGWcEC7VhNjJKZzReFkWP7F1gkqH4tvvChKQBMnzdm+44287e9kqOEvM9aYYFOmJE4OYY5/Qw== X-Received: by 2002:a17:906:4788:b0:b04:b435:fc6b with SMTP id a640c23a62f3a-b07c3a79fefmr497358466b.60.1757726238469; Fri, 12 Sep 2025 18:17:18 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id 4fb4d7f45d1cf-62ec33ae181sm4478774a12.22.2025.09.12.18.17.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 18:17:17 -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 34/62] init: inline create_dev into the only caller Date: Sat, 13 Sep 2025 00:38:13 +0000 Message-ID: <20250913003842.41944-35-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is cleanup after initrd removal Signed-off-by: Askar Safin --- init/do_mounts.c | 5 ++++- init/do_mounts.h | 6 ------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/init/do_mounts.c b/init/do_mounts.c index 5c407ca54063..60ba8a633d32 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -366,7 +366,10 @@ static int __init mount_nodev_root(char *root_device_n= ame) #ifdef CONFIG_BLOCK static void __init mount_block_root(char *root_device_name) { - int err =3D create_dev("/dev/root", ROOT_DEV); + int err; + + init_unlink("/dev/root"); + err =3D init_mknod("/dev/root", S_IFBLK | 0600, new_encode_dev(ROOT_DEV)); =20 if (err < 0) pr_emerg("Failed to create /dev/root: %d\n", err); diff --git a/init/do_mounts.h b/init/do_mounts.h index 6c7a535e71ce..f3df9d697304 100644 --- a/init/do_mounts.h +++ b/init/do_mounts.h @@ -16,12 +16,6 @@ void mount_root_generic(char *name, char *pretty_name, = int flags); void mount_root(char *root_device_name); extern int root_mountflags; =20 -static inline __init int create_dev(char *name, dev_t dev) -{ - init_unlink(name); - return init_mknod(name, S_IFBLK | 0600, new_encode_dev(dev)); -} - /* Ensure that async file closing finished to prevent spurious errors. */ static inline void init_flush_fput(void) { --=20 2.47.2 From nobody Thu Oct 2 17:52:05 2025 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (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 62CDA193077 for ; Sat, 13 Sep 2025 01:18:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757726309; cv=none; b=EggvdLxRI4MxQv4BqvKSJtbclrKNOPfZKyGnOwLYMMf+hinN/jV2fyw5Fp12sZu5JGL70YMhEZ8Q2pZz3DbGLkGkhStUIIEinORlrXuDS+orQlDbwFNN4euuwRE3Hll8lYe+0zRoHWOQKCkiNyR7pLZF7Aonuh0n+XCe+tLjZcQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757726309; c=relaxed/simple; bh=gqqGfNEIy1h395KAAal0EqVTqfHBZvgS53UXMAzAIg4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CaelP9VFiGA9s0GzRml1aK3w4MQqL70ts2ifLZcqWrYUwLP8vT99C4MyCau6cAAtQckrX8XfeFI95p4zQe+8g8mbe6+uCq+qJmzpdjvPyWvfhnhfTFg3k9SsjfMlIr6/R12mrqg+NkfjCroc+p9Qp1CcUWHo84X+TzpHx2QxxTc= 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=S3MR3wRG; arc=none smtp.client-ip=209.85.218.50 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="S3MR3wRG" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-b042eb09948so528486366b.3 for ; Fri, 12 Sep 2025 18:18:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757726305; x=1758331105; 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=azZv/jvf6IRhG0wveCq5ECQcNHAHnPNLNif/IfsLlkA=; b=S3MR3wRGhC/kXLFi7tEzWsnegJT9EOlT9m/C/MFzc4mLffsb1zPxwJp1ys/R7WkKtu lGH2qDNYyTs5AoU//E0brWD5vIAIWB1n3FQosPRaK+QRoGA0DZdmhSh/3U5iRy8W4DJp Fenld0TY4Z6v7xbzE43yOvUjTFLByOJ5B4tAPAr4+lqeApOt2QlD3yf3593AS0fFkyGD QIRxGEpNIvRn18hyuD6Dfkz7pZwRQAb4wq9+5bZobdNclLuXePQzPiQWeZfPixQk4bNj mQU+cnszndYycrVnwj9dFqcHiTNWiRrAaiY+Wgi8p28YIcrLfiIHcIobM8FFJ7GF7SK9 5mww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757726305; x=1758331105; 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=azZv/jvf6IRhG0wveCq5ECQcNHAHnPNLNif/IfsLlkA=; b=skxHRD1Sygovc0Sci7nbDuu32eRp4M4VbmDfyn2VDKVbczY4kTRYPFqX+oPRXHch51 b3Es4WFQvshmFbK+nd1Y07qryI/foV+DV3LE5UTtnMxEtf0clz5f/kZGMARdRmYJihng jcBEpdxUYvBzSn2acZpGujUa06thmsQR0yJOeDzIqVdYRtI9gAsj+maR+A4/FrvttKM/ l1f76Elpy7DXa1t/+Ih0Zd1wHsp/BUYX/zTlYpUQKdAlI/IQk9ZQCsRL/gGs0vX8vAmf 0QCa907gJ+hqfcgKby/MsMJ9IE9OqWjbHJiySgGDaC/U6aFae/obTvIJdhzfdVzLTmRg Iw+w== X-Forwarded-Encrypted: i=1; AJvYcCUUOq+VfKDwOOOwyXdNiJNObD/08VwOSTdkitJevduCD+MCEcfMmkpDtdqBNPrD1hG8QFLfsbz/3OP5WOQ=@vger.kernel.org X-Gm-Message-State: AOJu0Ywfmr2LL6uvNShS/Q7YEXj3w+w8paDNRb49vlh8iIT94Mpi+9NF nqC+BbNwSbJo+vFYxkOJtdgNaUelSgQHZUXCq8OSeTT+K57auSia1Ugt X-Gm-Gg: ASbGnctlt7deGQ06puktQAKAQq7JUAASEqGAnGiOvM7ItA5p6kcej+LaOVC4WgDiQQ7 kgBpihkdTv2GYx3Po7SQ2fxvq/qCliXZnt5FzWSZkk9Y5KYs5sWWG4NJdSwYeIxHmNVhEhiOHm9 V+55BQKxynkLSLKWT+4aqvxYLcFy99LAd33GgG9LxQErJfzmgb0yGmw9PdwEE0CZNbJ48jetzo/ U/D3X4QPsL1uIb8Ekk/PZP/WdHaPhZ0d1Bqr6JrFK4euO5UAATrdbgCXI4WxdXSji9hBlOH+vfk ih9RG10+Io26lYEe5RzcaiuN/rIleRs208qFSLy393fQxE4BpibT8Bfyg9CmvGwsc10OHoebdRm 2M9r6GtyDNyCJf9WNVxg= X-Google-Smtp-Source: AGHT+IExQyu+Z7m4GD3MP2gVTN78xlktku98kUsQddou1aWuxY/hOtzAat6yYKAto7vnFggGkvcCIA== X-Received: by 2002:a17:907:3f18:b0:b04:45e1:5929 with SMTP id a640c23a62f3a-b07c35cd746mr507554266b.28.1757726304508; Fri, 12 Sep 2025 18:18:24 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b32dd309sm475244766b.53.2025.09.12.18.18.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 18:18:24 -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 35/62] init: make mount_root_generic static Date: Sat, 13 Sep 2025 00:38:14 +0000 Message-ID: <20250913003842.41944-36-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is cleanup after initrd removal Signed-off-by: Askar Safin --- init/do_mounts.c | 2 +- init/do_mounts.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/init/do_mounts.c b/init/do_mounts.c index 60ba8a633d32..c722351c991f 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -174,7 +174,7 @@ static int __init do_mount_root(const char *name, const= char *fs, return ret; } =20 -void __init mount_root_generic(char *name, char *pretty_name, int flags) +static void __init mount_root_generic(char *name, char *pretty_name, int f= lags) { struct page *page =3D alloc_page(GFP_KERNEL); char *fs_names =3D page_address(page); diff --git a/init/do_mounts.h b/init/do_mounts.h index f3df9d697304..f291c30f7407 100644 --- a/init/do_mounts.h +++ b/init/do_mounts.h @@ -12,7 +12,6 @@ #include #include =20 -void mount_root_generic(char *name, char *pretty_name, int flags); void mount_root(char *root_device_name); extern int root_mountflags; =20 --=20 2.47.2 From nobody Thu Oct 2 17:52:06 2025 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (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 A9DFA1A23BE for ; Sat, 13 Sep 2025 01:19:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757726375; cv=none; b=rK4eYAe6Njk9iDkMGEmndXZvtpgLwxxL8+2EYNm5iLXSFzMvwcZMBHrPwypYJ/YHzB9fe7veoBdzTLxWjk2FLORhvNd20/ndwWHiNWn4HOgFNF+aoEDuz68MFayQsXC07djcha4JLs5Ge5QdxrWDvs94gumeA0zuLfXxBEDzEMo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757726375; c=relaxed/simple; bh=0dZBfgRsarIoSXxUVt0yhSx8VT0ilXZcRzH3UEVxVxY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E68ljv0wItd3NHhW7Yf2NO4FPE/SbGYwvOcSiXkiuVprey53+ZUUSdwkt+LT2tne/zTPQdfIHOVm6l3wVEn2mDLYAYd4j6mnniDM4z+Ihkgebe1TeqAGRUx//h0u5GKJeo8Utzypumq27RyWr6TxJ8CbpI+h/VK/Pp5tZaHKhqk= 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=JdasfyAT; arc=none smtp.client-ip=209.85.218.43 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="JdasfyAT" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-b07c38680b3so228178266b.1 for ; Fri, 12 Sep 2025 18:19:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757726370; x=1758331170; 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=01GQX+A5wcxVOfa45EtHUSgPI4YB4B2sFvA+zw7J76I=; b=JdasfyATZKgVuDGioUqz8M95vHmUjDA0X+pQzxpf/9WU/t+U6Kr5Hnn8A/pwyQbEEj tG9d5C4koMLr9jbbHvOg3kmOIpnqmXdSH9FzLhmDOw7FKaw9Ew5j+I2E2DqtaAF0kBLZ 78wviOrJLl+vWbv0yCaEb7FNWVwdYcrEt3ieIj7Euu12bhdJuyE+iXc5Pb1FYjgjb8hF cX5p4CCG19iBqFwJotgYe++od9U/7qY0/+Gz7PK70bhGuzPjXacGCU6LuDPtHZleKndu uaVp9WGOG3lboi/Y241AWiDrohHR47mki0UFwavjwS1g6Qe4yDpW5hurcQZvXGxBtRDc ssdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757726370; x=1758331170; 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=01GQX+A5wcxVOfa45EtHUSgPI4YB4B2sFvA+zw7J76I=; b=mUkkVjHree1ITOuYOxBaki10MD+sPI8Vp2/l0UuRtKIx1SFgpGnYpzjUZRVM2bTq1M CEw1Kyas/mfv+eCIRMkXyaQKtmH0jeia83+Ck+gtQd9gU/mImHXb1BByapoP/72cGgar g6ehyDKr3fmpJ8Y6b4axEYPhgo/5bGpNoq2FlIm6S90Hl/aU2ir24eJzuVNwh/ceKMq1 lQZ9xMZC6mkyPVHT7mN61YWHpRS6XKRf5wC+Oyu9lQQv3gsK2NT4lWVxAAxbGSo9TwXW Jc3ftYulN1Vq8OzLqYAefKEH3lxehfTr1MCgMTrf+8y0D4eSYMzp30x04WJtLOtMHGn+ LrAA== X-Forwarded-Encrypted: i=1; AJvYcCU5HQG1/FXyc7xunFPEfhdrrvThWtYC3NRlKLmbvgS+lHF1FJeXB9eDfq1AKZ1bh+rm3ftq3JT1fmiMyw8=@vger.kernel.org X-Gm-Message-State: AOJu0YwQMSzOG/VOWPjfTi/8yWUGpnc+HSSzOM5IifwIZUCUa+gDnyv8 lQ2vJE94P1m0f4tLAoCFGYJdN+v+f4pGxwN67kzdE4hi8fgMwv40EuAD X-Gm-Gg: ASbGnctEIBNTQtFOL1skupvKYoyClOkcCBMciYDJJtBouPErx0qiyfnlR/UrRcKzDRj +A6iYRU/WTvyaXc0r1BX0hHyGoLhAhtJmuLSK0flOcUmlR1khCvahApJRbK6XG/KmPLlFZLLqM6 ak0aJS+Y0V2vPyaoLvO6pGn2RVfTcuXZZVDboVDgkJP6UZC34Yj5S6KMlRSgQ6i4wpYM9udJPwl Qz/XiHfy/T2EekgQ1B6P202tI6uBwThNYmiTVoqttCRJkirrUjKwPr5HypIFzwG1D81UwxYBf41 9mGMGRRfw/+ZDdW+egf2II8B5Cg8pDDgvxfLwETvMqma4hXHDmcdKLZwIXghbuZmSikRKuVLib/ GRgfspU+Db7zkp3lN6weBx0WFRMTHVg== X-Google-Smtp-Source: AGHT+IEzeVwYKpSq5hVwsza+AqQmwMGGceGxnApLyMFPwDCsoulMW4PoMJQ37ACnH/5BZ1euJLookQ== X-Received: by 2002:a17:906:2493:b0:b04:9822:1ab4 with SMTP id a640c23a62f3a-b07c35fb2e4mr458597866b.27.1757726369974; Fri, 12 Sep 2025 18:19:29 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b32dd5bfsm465661666b.63.2025.09.12.18.19.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 18:19:29 -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 36/62] init: make mount_root static Date: Sat, 13 Sep 2025 00:38:15 +0000 Message-ID: <20250913003842.41944-37-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is cleanup after initrd removal Signed-off-by: Askar Safin --- init/do_mounts.c | 2 +- init/do_mounts.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/init/do_mounts.c b/init/do_mounts.c index c722351c991f..7ec5ee5a5c19 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -381,7 +381,7 @@ static inline void mount_block_root(char *root_device_n= ame) } #endif /* CONFIG_BLOCK */ =20 -void __init mount_root(char *root_device_name) +static void __init mount_root(char *root_device_name) { switch (ROOT_DEV) { case Root_NFS: diff --git a/init/do_mounts.h b/init/do_mounts.h index f291c30f7407..90422fb07c02 100644 --- a/init/do_mounts.h +++ b/init/do_mounts.h @@ -12,7 +12,6 @@ #include #include =20 -void mount_root(char *root_device_name); extern int root_mountflags; =20 /* Ensure that async file closing finished to prevent spurious errors. */ --=20 2.47.2 From nobody Thu Oct 2 17:52:06 2025 Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (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 BDE2E2E413 for ; Sun, 14 Sep 2025 03:43:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757821427; cv=none; b=QDjuWiVVM3V+9jasyxX9r4Ns5FIfWuUDJGv4LRDNDWUaOybwEi9hGTFZeTDFTiwzXn2aR4YdKraew88+ngSILow/msa33ymv3vq1SwdYqKQfrMwksXbO4p49o7QKP1V4+9dYmKUd3iWQZO/5fRboIlyBHU0E4RGW9XKxLBb6Pms= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757821427; c=relaxed/simple; bh=Rey/ebl7WFu2BHJpZO0tlGb9Yvux/yHNtNSpgXJUf3k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YC6JZeQBDKQW75LKnp82kGV52M+PmZw0iiVQy+JC9W/PnJwn+6VqDv1/PL+9E6aartdu5gTG45+7ZvoyrrWNM4PCFtvi3v95pVp7hcrBkg7aMMYuVY7a/2StmEUKqf6izkxWiJrbxWvzxq58txd3Aj0SAFzUTiuMdjE3h8EzrSs= 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=Meuoho8s; arc=none smtp.client-ip=209.85.208.46 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="Meuoho8s" Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-62f1987d49fso1099417a12.2 for ; Sat, 13 Sep 2025 20:43:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757821422; x=1758426222; 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=Edp+OfqM1e00xcpSWGvAGWC/LGQGu+BMiq7TC0KqX/w=; b=Meuoho8stdCgQ03Hoq6UgAr03TaN96IypV+PgLqP/nGA44yo2zt6U929mjRx+HCq13 FPWIoc3jiMY7qBRlszyNQbvaQVxYynf3mcVS4ZUqM9DXZXSglG7vOuDf+9BPpKpwhOE5 esyrIr1LmwK1sh8FW8bsMCVhqfrrjJWn3/4I8UakoSU28KzFPHuQL9W0/2J7g0A8nZ1O T5RsV+SSGzPKnwo1gUBPlfDSkMXh66xIdqSXJL7EHd2oWfyzikGuiq7xGrG+i6kSggsO 7dLhiHDpmeMEhTiC4sxGkbT4o1wUK7rDi6kWKBKQROziCBkBfVzJywQs93poRxb5DR22 ZxIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757821422; x=1758426222; 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=Edp+OfqM1e00xcpSWGvAGWC/LGQGu+BMiq7TC0KqX/w=; b=afo5F0w6YkWoEjmBgR0KN0yZ7gT/sPBNSJHTeYEd6tvf7MLfB3s3yZ1MLGDK4VxRcU 8SxbomUcNYCgiWHISvhFtqF7Y3bTIMElnbPjQNRF6TFQhFDU8TJKavQyiDvcvM8oD++U OHMe/qmAJZ1WizhwuHi+5h4wm+rbIP/M3lh4n54Gz7Jq1dNWQlLjXTODAjj3CYxFnjjF ROFLwdnHP79uv+0g9TczW5rDwtR9bNFhCWsS52XhwuhtfEmaA4Z/HOgYbDDOIjT91rqe BU4UcFrIfXjfNdlfaZlmSXKa+YVryLb6W3qrOE3JnaWOyWZmvAQ22oorrrLLCeSd4SNU iZaw== X-Forwarded-Encrypted: i=1; AJvYcCUJw5NT98NSsT54x7UUL8xq3FEP3gxy2mrLQR5Cu8+Vv58YG+enrV++1hJLpSL2OCW6HsXK0z8D5G+I4vo=@vger.kernel.org X-Gm-Message-State: AOJu0YweHLyvXhU3B4Sz1fSgKcr1HsaHL7jG+ngIIVYi8CFK4X2ai5kw ARd5J8z71X0v1Jg5eE9Du0pE0+8lvcVeBXi+SXVRhrj76LRIr7S0utiK X-Gm-Gg: ASbGncs2PIreMQQ4n3UoyZqaIvFRgrS/SCxDqWRyp/GRxA+JSOssNjOW17robZ6PFWe 8wSMQdTNCDMT9CfFfOr/U2IOsr70LLqgpfixrx/vc9Nd11YVRBgD0wP8QVUz4XdXwBpl8yE88/y WpY+ofx8wjOZBoEAIGRrOu85rt+rR3h32TN+3oxGS0t2pAoXlKKyzqA6FInwDWhD0dI+5CUD1WE lq4rfEqP4+1+KhjeMKBTYAd3lPBCzkuzPG5PWoVTssXmYGBL+b3RGSalwfCFYLz1HfUmB2xOy4o EHWUC1CpIjx0KH9zhLlo6vn1zpi26Vu+rDuhw4VxskCmSP0saso3SHW92iIG8kqGzCpgW9ZSkqB Hec0KDCdlla4wyokzXR8= X-Google-Smtp-Source: AGHT+IET6lw3qY9XyvNvb3pybcnRN4nnQ2bci5TeiF0EBvfDGIL/USbY9x3ZkIUotRlW6z+hFZZ7Dw== X-Received: by 2002:a17:907:72c9:b0:af9:6bfb:58b7 with SMTP id a640c23a62f3a-b07c354e9b4mr721980466b.5.1757821422077; Sat, 13 Sep 2025 20:43:42 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07d2870da1sm345137366b.13.2025.09.13.20.43.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 13 Sep 2025 20:43:40 -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 37/62] init: remove root_mountflags from init/do_mounts.h Date: Sun, 14 Sep 2025 06:43:35 +0300 Message-ID: <20250914034335.3506706-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It is already declared in include/linux/kernel.h Signed-off-by: Askar Safin --- init/do_mounts.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/init/do_mounts.h b/init/do_mounts.h index 90422fb07c02..e225d594dd06 100644 --- a/init/do_mounts.h +++ b/init/do_mounts.h @@ -12,8 +12,6 @@ #include #include =20 -extern int root_mountflags; - /* Ensure that async file closing finished to prevent spurious errors. */ static inline void init_flush_fput(void) { --=20 2.47.2 From nobody Thu Oct 2 17:52:06 2025 Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) (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 C319B23FC41 for ; Sun, 14 Sep 2025 03:50:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757821839; cv=none; b=orA6P74DJ9CWMYVI2IGtt7kt4pfvUdjqUMkn10yBGQWM1JHEMNEtOBS/K8I6PozFzCrJp+y4VH7lRjFi6by+myFuXoJSZvgQJyHTUuZFzu/cg7dTHc2zpHR+zklLszmgpnYgLEt7nCibMo/b9fLV+jZxuQQ0j5xSPgksg/O7LGc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757821839; c=relaxed/simple; bh=UKYo3sZQHTOBTzj/ZrSKU3L73PiTPpOmU1LUHeX039A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eqjpcJkt/D25WH2y1d7x3xC5iJ9GfeaBC/A3UYY4Jklp1dHvLoR4OZk7DroQkGTIGSmTErfQb0Wi/FzsbiWP/GrN4VAMs9MVPfcw/wG10l1SEeHEi+CpTXbmgtdthrsfHELG6AGpQbmeImmYGW5W5TuE7YpnKOcfMvO+kOiUQf8= 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=a1P8kBWK; arc=none smtp.client-ip=209.85.208.47 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="a1P8kBWK" Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-62ee43b5e5bso3292139a12.1 for ; Sat, 13 Sep 2025 20:50:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757821833; x=1758426633; 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=xULsRy9EzPzDuVUBFXoTlnqFZHMdg+FSwp5f1Vonn0Q=; b=a1P8kBWKhC/YGuTQ1qtgdu/eEmNliJm6xmjHlAYF/nZVCc+MkYl483G0Hq/aOPOuVQ co1t+z2BxO/DqCnrZV/EXoLvGXKtEHZqFdATOOJ7EzTdu3MgJ41k6O6rnPR886VF0J+g jgvNa+Ki1aT0KILtz2E0BMca3UYgzXBOakUCCFuFTU7ebx7Nd0hzzslIgv4hyWtZH0Us YbZQmnVSwIBoXEECRLCw5/S9dNhg9pi/sa5YxeFeAtv7H0GbAy2fZWrU6+0CkFOt7mcb RR3YbY8LMKAJx2sciiyJGNfQKUPjHVakvWWvmZVaCaVDH0xUngt3/RwvkIeU1VGaFSWY JGOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757821833; x=1758426633; 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=xULsRy9EzPzDuVUBFXoTlnqFZHMdg+FSwp5f1Vonn0Q=; b=avfFEg0qrSU8RpUQAUkK0oqLDp1rEoPMwHVhrCnRSOrvOEPa+AiZBg2admD4oG8tuS ISz+31VUSgKza8BZc/tZsFoDRRe9kMMNiG43jo+9QKHE510vs+ApdVu0i+PLXNnl/006 SvuRo6UmSnGxEa5xOfATxYOsMiGRQM+MuGKcEXA/XKV6U3dlb6alhbFTh56uwhY9K7eg izuhWOEvvLvcK7KamNzREDC0T2fLCWlCnKQUq3YNE1QxodLlHwXU+WoVy6xL/QuKnxce 79vdiaYq4xf7tZ42sH0TxCixjB6refZcmqroQSTKSoSOM6ZI9owobiLgq6gEwAd2uUTy vqJA== X-Forwarded-Encrypted: i=1; AJvYcCUsIRWMDZ0XelNbWfYEICb3U9TRpZvoz+rLkUhLCMoM7O5J5bwbW3DHmSFXoTRo0MGLhVz8gvyK7LUWJOo=@vger.kernel.org X-Gm-Message-State: AOJu0YzmmHOaHhVN08dfdlOrIMk7nzjibS8dWSIhDOMYrFpfbGFzK/NA DkTOcVgghoIbniNKeUwefcDV3lhUK9N1IBnZncxxvS/5KCwcb56CRrH0 X-Gm-Gg: ASbGncv/2/2aIG1PlTvauo+npBvlxanH2pP1fnHwFt9sdNVIUDn6yZUbs0J3lh/eF2C qEBZIneI2vCaJDR1ySpRa9tkuEp8bb4KwUSbxc5vflZXwWLeRtJmDGKqinAmvFsPL4RZAJ/+XEk 4svcYTjPbx3Ee/hh9Wxj0lrnm4VZBxW02bOi0XC5MuVq+IH2nRcxZQKN66MvJfIPrTn5IzMeJQ+ OPL+pNd3a0yA2xZV7cX+ZRugcW3rc6K1txIkoRiCfpglNspgtvzhYTjGvYUHjxSsPF+0/xFZYQg QChovnAv3TU7Y26EHP8HCN5k9+RkVK8gp5C0aIZCPL4UyUu8f7aGTLWx7dGmpRkEhhcqol5SJn+ uRfkpRFNnqaO99hMJh3TlLKWdKk1Sqg== X-Google-Smtp-Source: AGHT+IHE3K7efxQ+hk8pVBE6YY31PD4G3LjwwPuEi1DqCDNI+Ud0foCSPIjpPnt40T661VaNMc1/Ow== X-Received: by 2002:a17:907:3e8c:b0:b07:8836:dea9 with SMTP id a640c23a62f3a-b07c3819dc5mr855439466b.39.1757821832889; Sat, 13 Sep 2025 20:50:32 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b32dd3efsm668828766b.55.2025.09.13.20.50.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 13 Sep 2025 20:50:32 -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 38/62] init: remove most headers from init/do_mounts.h Date: Sun, 14 Sep 2025 06:50:27 +0300 Message-ID: <20250914035027.3609569-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is cleanup after initrd removal Signed-off-by: Askar Safin --- init/do_mounts.c | 2 ++ init/do_mounts.h | 10 ---------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/init/do_mounts.c b/init/do_mounts.c index 7ec5ee5a5c19..5b55d0035e03 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -5,12 +5,14 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include #include #include diff --git a/init/do_mounts.h b/init/do_mounts.h index e225d594dd06..53e60add795a 100644 --- a/init/do_mounts.h +++ b/init/do_mounts.h @@ -1,14 +1,4 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include =20 --=20 2.47.2 From nobody Thu Oct 2 17:52:06 2025 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (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 0647A268C73 for ; Sun, 14 Sep 2025 03:51:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757821873; cv=none; b=XNTIvrftxGqVrVL4SiElNMa8bnTLGFlIcBi5yG92SLLJJ5uaezS0cyrttoBjq415H91N/ra0ebug19+CNXedsxbW358Yj4VVodZ1K330jSQZ16qTpYezt8gYeQx81T4A3uggOwggKlZ6li6qZSuOJkx4UvED02OO3wf6ItLePi0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757821873; c=relaxed/simple; bh=0pa06GJsqjKCCDz/UM3o5nwPqkgP4CqvzP324rR3v40=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A+Qf2KqQ6H7LhFaPET+9CXi6f3H+8ybOtrm7PiHZAnel9S7dBpFV4puokuYWZiPbBTJAcDnX01fVkR8bxh25x2v3AlIh3F6BoQFIIXjSV/m9mxzrUN7sMuQG/ej9wv7ncpB+bEpIxJRViJq9aigVC8X77IfufXje6yi0fbHqeHQ= 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=Q8exd0Or; arc=none smtp.client-ip=209.85.208.44 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="Q8exd0Or" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-61a8c134533so5966249a12.3 for ; Sat, 13 Sep 2025 20:51:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757821868; x=1758426668; 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=cgyNirakXvU+05rXEnyXXLzO67oYWYN1IcZHpjjqHUg=; b=Q8exd0Or+KP3IfpJ/F6cr04Z8ZzprXAK/vvOy0fDtx94X4VdoDeaLl53x+Re5XVu87 nMyvaYDn8vFmTcEvvBxemBcs/KQak0F949JM4uH33s339OQt5URkPKDSAY3+ZGKOdjL5 pUJ94likUMs0rBMqjlpvJwgZdJbK3S9flcLQ8zD5bq7g6BoxDcTYuO+f8U85RhZRiEFd NWgbXH/2vbui42YTjC9kWIfsAixItMc1GfQiwH5d3DjDt9wpiScun1VkZoezAqvc6RKI 73MhrVf1ZHdX6nrAEPt0Dk6q5BbIrsUiJClkzy8cJCjt926MOo3foy+tV7x7JwQDnt3k Kq1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757821868; x=1758426668; 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=cgyNirakXvU+05rXEnyXXLzO67oYWYN1IcZHpjjqHUg=; b=HYWymBlrPljbJazNt8rLzNJmEUyjyQHTQXpwpjJiabSjNS92DDKqv8+Y5HpqaMx4vW bmu0dd6T1zfujPBNK8eRUPq2EjGRDslKdbL7+pABk6ZjsAcg13M0KB8DcfcdRwMm1aC4 QJ+F3Z3O6K7U2ISL1XWAsJ8t8Cy7bkM3Sk7hwT6dYIgywafQ75TbOUWXxAhOmnNjkQdo vnbF3oFJEunmrg2iWBEGWbBWLUS7+PHLoX6DJBkFLJBpNjw6hSxwY7GbeOsH+pQuK5bp RbGf3+P0kpyLfwL0TFKH1bomejFcWUdC0RH1sRtpDl/OE/ycBXcRbMFE0vVRLIffmcFB wA8Q== X-Forwarded-Encrypted: i=1; AJvYcCUnzvvaUGLsFF+B3qT9xLonzWbqu651ZYzvWhL13QhTj6Qo5kO+Xhf+wrJCa5hWNOC8KQF/szX79FHUdm8=@vger.kernel.org X-Gm-Message-State: AOJu0Yx7NLHCXrnqnQUwsfyc4CEfP4eRFUekw8rNBjNUsPTKXxt9XkM5 JvBuZsvujXH7zohDpy7+ovYwGVuU+xfrwyHopHBUsDLq8Zj+sn1na6sQ X-Gm-Gg: ASbGncvbl9RRgBAZgTfWMpGhpPQtwyJvqGgHD5mAQfzVek5V/La+E/HUlPGJqWmX/p7 RwJvXV6EwKhoe9GDnj/hlVVmUsSaEI6GRDcjW89eWKbHI21mzQ6I3KAuiugzk8UofGg6HiRL9Nh auk64NlqO0/qc/RzIY06Evwm7B5xYFvmO/1oSaYwx1PqBhDQd1WHUZlQhZCyjKpXAF9bLDTMDIL /z9FWv9RE+Ov22HYZPMavklOqzI6vLO82GwPygG75UmRPJkoFv4+Hs/nuptwNzAkjb0G2hkWoxz pljQMX56VtQf7Pq07NMimV5ggk8YO8QcDRpOFzouw72uUfccRTW1OgaueSlmqw5Y/HSn5Y5JJ7I 2i2bMiZR1bIHCh7210SM= X-Google-Smtp-Source: AGHT+IGYiK6likOM/TjE1BLl/jI3UX22nGT0EQIxF87CUWohx3tkGnMcAa8PzC4lwu+rbC2577QTfw== X-Received: by 2002:a17:906:46c7:b0:b07:da17:79fd with SMTP id a640c23a62f3a-b07da178367mr507229866b.17.1757821868321; Sat, 13 Sep 2025 20:51:08 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b3347b6fsm679031866b.111.2025.09.13.20.51.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 13 Sep 2025 20:51:07 -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 39/62] init: make console_on_rootfs static Date: Sun, 14 Sep 2025 06:51:03 +0300 Message-ID: <20250914035103.3619203-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is cleanup after initrd removal Signed-off-by: Askar Safin --- include/linux/initrd.h | 2 -- init/main.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/include/linux/initrd.h b/include/linux/initrd.h index 364b603215ac..55239701c4e0 100644 --- a/include/linux/initrd.h +++ b/include/linux/initrd.h @@ -23,6 +23,4 @@ extern unsigned long phys_external_initramfs_size; extern char __builtin_initramfs_start[]; extern unsigned long __builtin_initramfs_size; =20 -void console_on_rootfs(void); - #endif /* __LINUX_INITRD_H */ diff --git a/init/main.c b/init/main.c index 58a7199c81f7..f119460bf8e1 100644 --- a/init/main.c +++ b/init/main.c @@ -1533,7 +1533,7 @@ static int __ref kernel_init(void *unused) } =20 /* Open /dev/console, for stdin/stdout/stderr, this should never fail */ -void __init console_on_rootfs(void) +static void __init console_on_rootfs(void) { struct file *file =3D filp_open("/dev/console", O_RDWR, 0); =20 --=20 2.47.2 From nobody Thu Oct 2 17:52:06 2025 Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) (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 74CAA25334B for ; Sun, 14 Sep 2025 03:51:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757821908; cv=none; b=KUxH+y0d/fIPmSh+l0ekbWjPVUR9bbwIyCqNe7bHvNIYmUzxifg7myMgwxDaBUcx7FDYnUfvESzqG51JPjOowLi/3vYaHfRQKNNq4KaeICAsf3BkVVJ8XXDLTpHYWYvZp8XS5y17gjtER0xtJeC5UyXfPQugwEOrOU2Y9kS/Me4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757821908; c=relaxed/simple; bh=E44LF/8lHGTYomA5WWH/VDahlaDv99Wi8d81CdQz9ho=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fSc38cp3Ih2HToDYWpISHBUILI6VvfP31d0ByswERwXy2nH3TmE6qO3fvCJwmq5FXR0406EB0ej91Dx0ORqDd2RcSO8LqCKgfy7gXCOtwvm+PdTOvxYon/Pus7nvpgEVkfv82poDC8z/Fh2zOGgPMNYcxtn6AQ57kNG9EqnFMsQ= 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=BvPFXZJ3; arc=none smtp.client-ip=209.85.218.46 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="BvPFXZJ3" Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-b04770a25f2so429869066b.2 for ; Sat, 13 Sep 2025 20:51:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757821905; x=1758426705; 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=eXT46s/O30O5D6iGHqIIZ8OQqeCOoCO9YfqStJzQ+0w=; b=BvPFXZJ31jpsL4MeINgm/PhbCj3+Kor/W2sgiEY+e/xeD0jyjmm3NGEe5ipXjFcwfh Tly0jR3Ua+cBpmJXCPZ5AskPNQojr/9CDSvRxdNSq8A1rMJzg27q7vMcYsI1s89GCuBM 5aDRsLN3C9uYggpc9DJ6TiVdxRok7lXsfXcjo+6f4kkeZ8oAy7QTNvz5rYfLZtGhmFH7 17VwQaeOaEdgDebYfTTyBacPnnL3DepEX2BpHD6j+6bw5kLDdtGsDExJ1bVgaiVC4Qqq stg1f48eoFfsLbQrwSYzC8oskYz/ny4gvFb4DcYAtuF8xeDcnKxO0ZWwzcbAqudVtNDU Dsvw== 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=iDQ8Vrgny4uhfu+Yi6+2JmBkaroL7++P2EGGRX7K1X+fr7jqBmY7RIkQf1cAFha4i0 rpE1KN+N2S2d4dsJkkPPICQHSBVW3zEOpMnyybBhSa+Wt+DjV9DSmf8KoOKOxXdYSIUW 54qAO9MwuUJtmG8dvbpV8dU/r8hCeoHGaeN0QuEAFPv4EGHerLkvZdwO6pTT8gw0hJzf l59belu87DWUeiorbLXpe0impqhq+S1ocSIFfhei6/SYyx9/RUlzgFI69LdL1gnnCwXP SabUd4Mjlobi4ULj+6pc/dmpK3Lncwe4po4aIlSlinH+o453INifFEshxMS+htiCpHLd LS0w== X-Forwarded-Encrypted: i=1; AJvYcCVUN8auSsWYddnVbrC6Suf4x9woMeK7fjeCEEBL7Ky20SVBtrQnwDgYVIU6NCpVcUWBgCySVRbDMvpyCK4=@vger.kernel.org X-Gm-Message-State: AOJu0YzSJeuj3bA2BG/xout+UQGwzi0V2oDRZ4IdeZfMGfKs04uhuq0c cx37xXDqu5lFP/fzUkudbVlUkuN0rVjkP9m3X6aCdSikDK2eBehzocuY X-Gm-Gg: ASbGncv6ZMOoSUR9GAeFhdeuPisz0OyFMk87khI1tAzxPvSLneY+EbD5E0FxGSHfYkN Jj0y5yK2ojrI+S+zRUwfcL1MWq6K2Piil4VmfxBS8WhYNXYnwZkPwz5MuB1U/AIo5VpERUT2Q+e xg9+kXd3lBphlEAmcfk2CVYuFSvNNUIkAYq5z+Gc5LuUeRNavShMJGP4nuB7We9e09AvUxH2kcR mYdBRTFrlW3UDt69M+pzMOCB8asfplXPqzbTn6FlUtIzjcRe1/Pyu+pKoaxVS7kr7vYv3aC89uL 1/BWQ3EvmSRiYIIcCTnha/fWZx/o92N/52JtlsTJdSep5kfwMUB6n2HVCtS/ex96jqETV+FIlG7 +eBC82f8CbicyKVogDjI= 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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) } =20 #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 =3D=3D virt_external_initramfs_start) start =3D 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) } =20 #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; =20 extern unsigned long virt_external_initramfs_start, virt_external_initramf= s_end; -extern void free_initrd_mem(unsigned long, unsigned long); +extern void free_initramfs_mem(unsigned long, unsigned long); =20 #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 =3D 0; } =20 -void __weak __init free_initrd_mem(unsigned long start, unsigned long end) +void __weak __init free_initramfs_mem(unsigned long start, unsigned long e= nd) { #ifdef CONFIG_ARCH_KEEP_MEMBLOCK unsigned long aligned_start =3D 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, asy= nc_cookie_t cookie) * free only memory that is not part of crashkernel region. */ if (!do_retain_initrd && virt_external_initramfs_start && !kexec_free_ini= trd()) { - free_initrd_mem(virt_external_initramfs_start, virt_external_initramfs_e= nd); + free_initramfs_mem(virt_external_initramfs_start, virt_external_initramf= s_end); } else if (do_retain_initrd && virt_external_initramfs_start) { bin_attr_initrd.size =3D virt_external_initramfs_end - virt_external_ini= tramfs_start; bin_attr_initrd.private =3D (void *)virt_external_initramfs_start; --=20 2.47.2 From nobody Thu Oct 2 17:52:06 2025 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (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 27C2E26A1CC for ; Sun, 14 Sep 2025 03:52:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757821946; cv=none; b=H1twmNlSlSEzWOsRsOAYyyspsrxAJS24FOrfhujv3zOLJ9PZEqavlSku1pd10SP7QS9k5tencXp+xGU8+WuCBURGl6cYRT1jVN1Knd6/o6A5ZC1e2IYZdxnwsYAD/HUoX5vWL4XkgBmSQsIdlyGOVPn/T7Nu9HaK5XMwdX8bMFs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757821946; c=relaxed/simple; bh=UZLn6ULQgc/FnEmwCGdDgCcEQNlktPyYM0GENq2QFck=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Uyx0z96NvsWSCxMIaSR8mvaFWJHp4B79tesl9e0Zu5PrR2W3D5tlkCGWpxOrLknVH1J6x34+JDp7xJMlUd+R6h/JVLZrtQUt1BEE3AoEHTFBDqI72w2i+UjNlh0rwqQ6anxTY+CATqm+tsWZtIxZ7Kjt4j9MHOJFEgA+kR2nC9E= 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.48 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-f48.google.com with SMTP id a640c23a62f3a-b07e3a77b72so134267066b.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=H8HwZ0HozKDv5mUgV1tr5nHznC4r3kBRGBdcSPO/V3TTcEjXs58ZqqChWFkjSuEMxQ u6/4ElpSPtQYawogpq6bDSONFt5Ax32RRiAv3L2kubtcWREAvgdqxl7MBzMBmTJZXyGb sZlwdUJNWYNi/WnKgGPTufz8v+RbYhxXCl+hBUoPLOUBMvssXB+GOKDmqwngn+dbv6UZ r2zNcZ8BDTSqvY2xPs4EgLyZcb2n7huGibIw4FRH+/kZohnhpfI6V78zTMhY11syIfnm GGS2qUobexZPrX7jg6YtiAopWot2aUbWUMhskdHHUDTg0Dzm5y1HpjPgH0o4k/Z6KX3G 5Qhw== X-Forwarded-Encrypted: i=1; AJvYcCWPbo94N+w39HmACBB26rH52QXo909GNgA/ZyzB7XchBnfDspRvu+DQD9WF0NOyDhA9vvjtBCMTd5yfT4o=@vger.kernel.org X-Gm-Message-State: AOJu0Yw9icfvKx8RkB/N+jDfvZS5A+bIJSqn5UlToX2cLGc7zoL4BoXP 02fK4/+0QCj/oUSIvG8BK6gROoS6sIc18QLJpzbdNMrxC/RTZQ9+KUt6 X-Gm-Gg: ASbGncvxTUCUdfiLzbyS7JTh/kdgfQkA2XiTfhpCbY8uVeu8UtovdGwcq7PKjsuOXwk OYyeN3hUXCHGC184tStG5dqJYwLp5e/Ai6H8iulG0pMEcNwD0+9uby/LnHgbPVN2oWqambNdLgM o7q/6EzqYfyugsmYNniyXq/2pT1ONsdYhyN+v7S4Ze3H9tR65JqHBOBpc66aVJErnR27cbJSlsZ j9B1s7w/Unyls/N+HOm0I0nkYc9L2rPDTObAcdrXIbzpcnAU6IrmcyK6A1U8aOOXOGzWVIK/9BJ dqdTm3ng8x5M83qT3PCLMO72/FbBg0H9kNQF5XDR6ysZBqHKent2aKWYU+kUtaBwELioWCOPRs4 6cBBRGioLgjDyIgUgjpA= 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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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); =20 - reserve_initrd_mem(); + reserve_initramfs_mem(); =20 arm_mm_memblock_reserve(); =20 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(); =20 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) =20 dma32_phys_limit =3D min(4UL * SZ_1G, (unsigned long)PFN_PHYS(max_low_pfn= )); =20 - reserve_initrd_mem(); + reserve_initramfs_mem(); =20 /* * 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, vir= t_external_initramfs_end; extern void free_initramfs_mem(unsigned long, unsigned long); =20 #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 =20 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); =20 static BIN_ATTR(initrd, 0440, sysfs_bin_attr_simple_read, NULL, 0); =20 -void __init reserve_initrd_mem(void) +void __init reserve_initramfs_mem(void) { phys_addr_t start; unsigned long size; --=20 2.47.2 From nobody Thu Oct 2 17:52:06 2025 Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.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 F03B62459F3 for ; Sun, 14 Sep 2025 03:52:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757821983; cv=none; b=Tqs420eKvKIC3UH52buXF7HSeTPbfMbpt4Utz2FA3H2kFpcD+fvm6gffFTqUTWoAfO3sPQneSKzU5VaKbkxqsk/217xtuUzgLunnqUxb4ar3rlNtrYgZDQIUn715v3js8YaJzUwiAkfT0waN3azrDabhO5VHa5xGd0nxaPS7WAA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757821983; c=relaxed/simple; bh=LMgtS7zLTnFefTUU75+3aHu+RqXM9pA5ZmIuER5pXRs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XA0UoLoo4uyj7CQ2nIKg5as6uLQXllAdafEt/d2xDpSRn2qOtAuX3N4Bjq/A5A8KWleqpCtqtWJY+pHVJuq1NR+Fs4DlsHyOoDb45WITqJjdtBb7LGTE9ZUPBWeU6i1cWRwL9dAXdT5qRr65mMIf4Y/T3i9SXfGKgetB1AKM6rw= 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=NGAFrY/9; arc=none smtp.client-ip=209.85.208.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="NGAFrY/9" Received: by mail-ed1-f42.google.com with SMTP id 4fb4d7f45d1cf-61d3d622a2bso6288499a12.0 for ; Sat, 13 Sep 2025 20:52:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757821976; x=1758426776; 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=GGxQFMp8lGOCxr3zDvSjgZrq/vjHM87qRoa1426bdXU=; b=NGAFrY/9JS0garmprNdYDLpoSl+05ArBpyrAC9xS6+OBhZJqt4D6qDDvvlN1rzWAmE GsK3GA8sF7Zf8GHy2l8eYTu5WOK0yvicuhs2wvZsyXE/EDPE/8t+BOHkOBiNGOuR6gSJ Gr4xUFSrxZYgFI20q95DckoE1FCMdYbWcHntvl6xINZ9TDhOO6pbdFiBuhdWsoOw9Ofn APH6UcRzk8zkCZW+Ra1a6YBF2nG0bx/6WvZRVngSYbA/1+QDjLX2jGOwTyGv0fO3RSUo OYnrbbFXoHeLjhCKpK70s+Zunp56Xz8JOZxMc6pjWtTx+Rjyif9MTafRSExa8CneEFYc 8CWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757821976; x=1758426776; 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=GGxQFMp8lGOCxr3zDvSjgZrq/vjHM87qRoa1426bdXU=; b=FHOJ/o21pPF0PSFJewRBgxUFcA3vnFwMTR1RT78iIJbbtf0OkWbri03D1Pm/YkpuDb zkR3AFGayW2f+hgeNQ3F28LERD++ocHBbcvAJQ3P0COPLIn3dEhehJghO1Im7ZMurCa0 MOSxrzwqemIYrcSEHZzlunlQokk6pI0oM1LR/Z4MaDp4LYbZe6OMPn4CI+6Uyf9WSwrh 0eoGkAY1LYQS0tDPvhuml4On4ESH5v4cyqCXw4qpZWNylo0hNycX6XNXf5jkRUu9O9Hz 3hCKAqBBnHKjId0HzSTmvK1EldxxVCkO3Inoa+QhPlDj3pNF10aIZ7dTwgO/H8cxPcHf cRAg== X-Forwarded-Encrypted: i=1; AJvYcCX/FIVCktj8Dou29SbAhkuZYhiQKtbWVqdMhBtKUC82ytJlmZHO774KACHgUViPlJitnL1MhxJIm0NuOKc=@vger.kernel.org X-Gm-Message-State: AOJu0YxAqMyHYQUDL4XTc83xbTSiqqJ5DZD20lCn8TihqlPQlvt8TM/B yIr/SPPStGMNgXRbHEjA3vEYp+2Y5m5ep0qT2mm1yMGPau/wzdrTu1Ip X-Gm-Gg: ASbGncvyGCcizTV+h2wzcp1CsFBN2FTxILonPlgyX2uV4wqRB8ikc1lWgMT2lKEYboh xptI0Icqguoja9fFYD83TSGpOB6m2Jvc3ezdD0Wz5+gVItmS09iJ9/0LQ2c5CE9zXb4lZ6SxKNB FdDeOzSGM7IgiUr6LagRABWoal4U1rpRSpikIpGEXulwn8801fA8tQs/JH7qdsezEMwVD5YdoBd FTava9clZemsj0ReX3d8ds+Uo0WuBvpAtsjzecUwA6nxzTB+GQUwca4AZvMam5wP47cSdIuj7sG Cw9W/2skG4PKpY3DO22Imj4ab8HDfV2LjvPaatkhsTA/m1F2hdHS9k+q7sqHW4YHjNO7ZAlMLN+ zoeT8kkC4ncp4SUDuh6bz7mUoWtB/AA== X-Google-Smtp-Source: AGHT+IH9xzJ553wZWDYkr7UyRf4TwcRTicJafQ2AYjwvL+0tbQTxwZJG0zX97H5xMAMWT4x8GiPAYA== X-Received: by 2002:a17:906:fe0b:b0:b04:7eba:1b55 with SMTP id a640c23a62f3a-b07c2501249mr788571566b.19.1757821976146; Sat, 13 Sep 2025 20:52:56 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b31291b0sm675041666b.34.2025.09.13.20.52.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 13 Sep 2025 20:52:55 -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 42/62] init: rename to Date: Sun, 14 Sep 2025 06:52:50 +0300 Message-ID: <20250914035250.3651258-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is cleanup after initrd removal Signed-off-by: Askar Safin --- arch/alpha/kernel/core_irongate.c | 2 +- arch/alpha/kernel/setup.c | 2 +- arch/arc/mm/init.c | 2 +- arch/arm/kernel/atags_parse.c | 2 +- arch/arm/kernel/setup.c | 2 +- arch/arm/mm/init.c | 2 +- arch/arm64/kernel/setup.c | 2 +- arch/arm64/mm/init.c | 2 +- arch/csky/kernel/setup.c | 2 +- arch/csky/mm/init.c | 2 +- arch/loongarch/kernel/mem.c | 2 +- arch/loongarch/kernel/setup.c | 2 +- arch/m68k/kernel/setup_mm.c | 2 +- arch/m68k/kernel/setup_no.c | 2 +- arch/m68k/kernel/uboot.c | 2 +- arch/microblaze/kernel/cpu/mb.c | 2 +- arch/microblaze/kernel/setup.c | 2 +- arch/microblaze/mm/init.c | 2 +- arch/mips/ath79/prom.c | 2 +- arch/mips/kernel/setup.c | 2 +- arch/mips/mm/init.c | 2 +- arch/mips/sibyte/swarm/setup.c | 2 +- arch/nios2/kernel/setup.c | 2 +- arch/openrisc/kernel/setup.c | 2 +- arch/parisc/kernel/pdt.c | 2 +- arch/parisc/kernel/setup.c | 2 +- arch/parisc/mm/init.c | 2 +- arch/powerpc/kernel/prom.c | 2 +- arch/powerpc/kernel/prom_init.c | 2 +- arch/powerpc/kernel/setup-common.c | 2 +- arch/powerpc/kernel/setup_32.c | 2 +- arch/powerpc/kernel/setup_64.c | 2 +- arch/powerpc/mm/init_32.c | 2 +- arch/powerpc/platforms/52xx/lite5200.c | 2 +- arch/powerpc/platforms/83xx/km83xx.c | 2 +- arch/powerpc/platforms/85xx/mpc85xx_mds.c | 2 +- arch/powerpc/platforms/chrp/setup.c | 2 +- arch/powerpc/platforms/embedded6xx/linkstation.c | 2 +- arch/powerpc/platforms/embedded6xx/storcenter.c | 2 +- arch/powerpc/platforms/powermac/setup.c | 2 +- arch/riscv/mm/init.c | 2 +- arch/s390/kernel/setup.c | 2 +- arch/s390/mm/init.c | 2 +- arch/sh/kernel/setup.c | 2 +- arch/sparc/kernel/setup_32.c | 2 +- arch/sparc/kernel/setup_64.c | 2 +- arch/sparc/mm/init_32.c | 2 +- arch/sparc/mm/init_64.c | 2 +- arch/um/kernel/initrd.c | 2 +- arch/x86/kernel/cpu/microcode/amd.c | 2 +- arch/x86/kernel/cpu/microcode/intel.c | 2 +- arch/x86/kernel/cpu/microcode/internal.h | 2 +- arch/x86/kernel/devicetree.c | 2 +- arch/x86/kernel/setup.c | 2 +- arch/x86/mm/init.c | 2 +- arch/x86/mm/init_32.c | 2 +- arch/x86/mm/init_64.c | 2 +- drivers/acpi/tables.c | 2 +- drivers/base/firmware_loader/main.c | 2 +- drivers/block/brd.c | 2 +- drivers/firmware/efi/efi.c | 2 +- drivers/of/fdt.c | 2 +- include/linux/{initrd.h =3D> initramfs.h} | 6 +++--- init/do_mounts.c | 2 +- init/initramfs.c | 2 +- init/main.c | 2 +- kernel/sysctl.c | 2 +- kernel/umh.c | 2 +- 68 files changed, 70 insertions(+), 70 deletions(-) rename include/linux/{initrd.h =3D> initramfs.h} (89%) diff --git a/arch/alpha/kernel/core_irongate.c b/arch/alpha/kernel/core_iro= ngate.c index 5519bb8fc6f2..83b799848b39 100644 --- a/arch/alpha/kernel/core_irongate.c +++ b/arch/alpha/kernel/core_irongate.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include =20 #include diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c index a344e71b2d2a..809651206781 100644 --- a/arch/alpha/kernel/setup.c +++ b/arch/alpha/kernel/setup.c @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #ifdef CONFIG_MAGIC_SYSRQ diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c index 1e098d7fc6af..00aaf1ed389f 100644 --- a/arch/arc/mm/init.c +++ b/arch/arc/mm/init.c @@ -7,7 +7,7 @@ #include #include #ifdef CONFIG_BLK_DEV_INITRD -#include +#include #endif #include #include diff --git a/arch/arm/kernel/atags_parse.c b/arch/arm/kernel/atags_parse.c index 615d9e83c9b5..2b49e0ddfa42 100644 --- a/arch/arm/kernel/atags_parse.c +++ b/arch/arm/kernel/atags_parse.c @@ -15,7 +15,7 @@ */ =20 #include -#include +#include #include #include #include diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 0bfd66c7ada0..876039b24290 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index a564cbc36d18..ae5921db626e 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 77c7926a4df6..bddbb473ad88 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 3414e48c8c82..e50533faaece 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/csky/kernel/setup.c b/arch/csky/kernel/setup.c index 403a977b8c1f..9feca38d4c47 100644 --- a/arch/csky/kernel/setup.c +++ b/arch/csky/kernel/setup.c @@ -3,7 +3,7 @@ =20 #include #include -#include +#include #include #include #include diff --git a/arch/csky/mm/init.c b/arch/csky/mm/init.c index 573da66b2543..f2d1004fc6ae 100644 --- a/arch/csky/mm/init.c +++ b/arch/csky/mm/init.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include =20 #include #include diff --git a/arch/loongarch/kernel/mem.c b/arch/loongarch/kernel/mem.c index aed901c57fb4..5ec4d18c9000 100644 --- a/arch/loongarch/kernel/mem.c +++ b/arch/loongarch/kernel/mem.c @@ -3,7 +3,7 @@ * Copyright (C) 2020-2022 Loongson Technology Corporation Limited */ #include -#include +#include #include =20 #include diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setup.c index 226262f35dc1..5d0124cbe94b 100644 --- a/arch/loongarch/kernel/setup.c +++ b/arch/loongarch/kernel/setup.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c index 80f0544c1041..b9c9b2e3a150 100644 --- a/arch/m68k/kernel/setup_mm.c +++ b/arch/m68k/kernel/setup_mm.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include =20 #include diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c index 4d98e0063725..6d3d5a299383 100644 --- a/arch/m68k/kernel/setup_no.c +++ b/arch/m68k/kernel/setup_no.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include =20 diff --git a/arch/m68k/kernel/uboot.c b/arch/m68k/kernel/uboot.c index 5fc831a0794a..416e3f8f879d 100644 --- a/arch/m68k/kernel/uboot.c +++ b/arch/m68k/kernel/uboot.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include =20 diff --git a/arch/microblaze/kernel/cpu/mb.c b/arch/microblaze/kernel/cpu/m= b.c index 37cb2898216b..a5d2c564d4e5 100644 --- a/arch/microblaze/kernel/cpu/mb.c +++ b/arch/microblaze/kernel/cpu/mb.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include =20 #include #include diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c index f417333eccae..7f537307b71c 100644 --- a/arch/microblaze/kernel/setup.c +++ b/arch/microblaze/kernel/setup.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c index fabeca49c2c6..f54d71160712 100644 --- a/arch/microblaze/mm/init.c +++ b/arch/microblaze/mm/init.c @@ -12,7 +12,7 @@ #include #include #include /* mem_init */ -#include +#include #include #include #include diff --git a/arch/mips/ath79/prom.c b/arch/mips/ath79/prom.c index 506dcada711b..fcb45fe198a0 100644 --- a/arch/mips/ath79/prom.c +++ b/arch/mips/ath79/prom.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include =20 #include #include diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index aed454ebd751..47dc7eb99ef7 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index a673d3d68254..5b109c737547 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include =20 #include diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c index 38c90b5e8754..ff8b2d8ad7ab 100644 --- a/arch/mips/sibyte/swarm/setup.c +++ b/arch/mips/sibyte/swarm/setup.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include =20 #include #include diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c index 3cc44fa4931c..d3d60c42df46 100644 --- a/arch/nios2/kernel/setup.c +++ b/arch/nios2/kernel/setup.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include =20 #include diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c index 337a0381c452..27ae87c09b0e 100644 --- a/arch/openrisc/kernel/setup.c +++ b/arch/openrisc/kernel/setup.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/parisc/kernel/pdt.c b/arch/parisc/kernel/pdt.c index 3715a3b088a7..49982a48c92c 100644 --- a/arch/parisc/kernel/pdt.c +++ b/arch/parisc/kernel/pdt.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include =20 diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c index 41f45fa177d0..1e403c26070d 100644 --- a/arch/parisc/kernel/setup.c +++ b/arch/parisc/kernel/setup.c @@ -13,7 +13,7 @@ */ =20 #include -#include +#include #include #include #include diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index af7a33c8bd31..5843f4a46e93 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include /* for node_online_map */ diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index b7858b0bd697..a2a1896f9e46 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_ini= t.c index 827c958677f8..a0ac845eb504 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup= -common.c index eff369cba0e5..53a416bc41ce 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index 5a1bf501fbe1..21d21b8291ef 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 8fd7cbf3bd04..66c2d563c094 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c index 4e71dfe7d026..f434e6dc1921 100644 --- a/arch/powerpc/mm/init_32.c +++ b/arch/powerpc/mm/init_32.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platform= s/52xx/lite5200.c index 0a161d82a3a8..e4222658ec2d 100644 --- a/arch/powerpc/platforms/52xx/lite5200.c +++ b/arch/powerpc/platforms/52xx/lite5200.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/powerpc/platforms/83xx/km83xx.c b/arch/powerpc/platforms/= 83xx/km83xx.c index 2b5d187d9b62..b0426b35f9ed 100644 --- a/arch/powerpc/platforms/83xx/km83xx.c +++ b/arch/powerpc/platforms/83xx/km83xx.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include =20 diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platf= orms/85xx/mpc85xx_mds.c index c19490cf6376..6b6c11931c1e 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/c= hrp/setup.c index c1bfa4c3444c..00a6663a0a88 100644 --- a/arch/powerpc/platforms/chrp/setup.c +++ b/arch/powerpc/platforms/chrp/setup.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerp= c/platforms/embedded6xx/linkstation.c index 4012f206ec63..8e41d0fb0892 100644 --- a/arch/powerpc/platforms/embedded6xx/linkstation.c +++ b/arch/powerpc/platforms/embedded6xx/linkstation.c @@ -11,7 +11,7 @@ */ =20 #include -#include +#include #include #include =20 diff --git a/arch/powerpc/platforms/embedded6xx/storcenter.c b/arch/powerpc= /platforms/embedded6xx/storcenter.c index e49880e8dab8..df458828eb22 100644 --- a/arch/powerpc/platforms/embedded6xx/storcenter.c +++ b/arch/powerpc/platforms/embedded6xx/storcenter.c @@ -13,7 +13,7 @@ =20 #include #include -#include +#include #include =20 #include diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platfor= ms/powermac/setup.c index 4c3b9ed5428d..ab0860868025 100644 --- a/arch/powerpc/platforms/powermac/setup.c +++ b/arch/powerpc/platforms/powermac/setup.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index b1c4876dadae..479a0861a93e 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 9bdb6f6b893e..7ce009c2599d 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index e4953453d254..e6556f9f2be3 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 9ce9dc5b9e56..814866e35120 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -9,7 +9,7 @@ */ #include #include -#include +#include #include #include #include diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c index fb46fb3acf54..b3778d78bb78 100644 --- a/arch/sparc/kernel/setup_32.c +++ b/arch/sparc/kernel/setup_32.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c index 79b56613c6d8..02b16827b664 100644 --- a/arch/sparc/kernel/setup_64.c +++ b/arch/sparc/kernel/setup_64.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c index 7b7722ff5232..f04dd1d6f382 100644 --- a/arch/sparc/mm/init_32.c +++ b/arch/sparc/mm/init_32.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index af249a654e79..b0fa82676e6f 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/um/kernel/initrd.c b/arch/um/kernel/initrd.c index e6113192a6b6..99edfbd78c00 100644 --- a/arch/um/kernel/initrd.c +++ b/arch/um/kernel/initrd.c @@ -5,7 +5,7 @@ =20 #include #include -#include +#include #include #include #include diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/micr= ocode/amd.c index 514f63340880..0086e285d60c 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include =20 diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/mi= crocode/intel.c index 371ca6eac00e..4bebf8b77542 100644 --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/x86/kernel/cpu/microcode/internal.h b/arch/x86/kernel/cpu= /microcode/internal.h index 50a9702ae4e2..b4aec58af7e3 100644 --- a/arch/x86/kernel/cpu/microcode/internal.h +++ b/arch/x86/kernel/cpu/microcode/internal.h @@ -3,7 +3,7 @@ #define _X86_MICROCODE_INTERNAL_H =20 #include -#include +#include =20 #include #include diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c index dd8748c45529..3eb6dad99288 100644 --- a/arch/x86/kernel/devicetree.c +++ b/arch/x86/kernel/devicetree.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include =20 #include #include diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 167b9ef12ebb..3b88d156ed39 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index c7ca996fb430..b7c45004f999 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 8a34fff6ab2b..d075d4178d36 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include =20 diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index b9426fce5f3e..34fcb5b8f386 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index 37ad99c10ac4..4ecb6bf897fd 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include "internal.h" diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_lo= ader/main.c index 6942c62fa59d..f32de7459e76 100644 --- a/drivers/base/firmware_loader/main.c +++ b/drivers/base/firmware_loader/main.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/block/brd.c b/drivers/block/brd.c index 05c4325904d2..a15b699d3a09 100644 --- a/drivers/block/brd.c +++ b/drivers/block/brd.c @@ -10,7 +10,7 @@ */ =20 #include -#include +#include #include #include #include diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 7cab72da2ea9..1dcaaea1dcfb 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 127b37f211cb..2e73de8a1bbe 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/linux/initrd.h b/include/linux/initramfs.h similarity index 89% rename from include/linux/initrd.h rename to include/linux/initramfs.h index 51c473b6a973..e9f523917a02 100644 --- a/include/linux/initrd.h +++ b/include/linux/initramfs.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ =20 -#ifndef __LINUX_INITRD_H -#define __LINUX_INITRD_H +#ifndef __LINUX_INITRAMFS_H +#define __LINUX_INITRAMFS_H =20 /* 1 if it is not an error if virt_external_initramfs_start < memory_start= */ extern int initramfs_below_start_ok; @@ -23,4 +23,4 @@ extern unsigned long phys_external_initramfs_size; extern char __builtin_initramfs_start[]; extern unsigned long __builtin_initramfs_size; =20 -#endif /* __LINUX_INITRD_H */ +#endif /* __LINUX_INITRAMFS_H */ diff --git a/init/do_mounts.c b/init/do_mounts.c index 5b55d0035e03..2df33c573d9c 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/init/initramfs.c b/init/initramfs.c index a6c11260e62b..8b648b09247a 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -597,7 +597,7 @@ static int __init initramfs_async_setup(char *str) } __setup("initramfs_async=3D", initramfs_async_setup); =20 -#include +#include #include =20 unsigned long virt_external_initramfs_start, virt_external_initramfs_end; diff --git a/init/main.c b/init/main.c index f119460bf8e1..5186233c64fd 100644 --- a/init/main.c +++ b/init/main.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kernel/sysctl.c b/kernel/sysctl.c index cb6196e3fa99..3bf92703332b 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kernel/umh.c b/kernel/umh.c index b4da45a3a7cf..c58b3e8e9256 100644 --- a/kernel/umh.c +++ b/kernel/umh.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include =20 #include --=20 2.47.2 From nobody Thu Oct 2 17:52:06 2025 Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) (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 5668C1D7E5B for ; Sun, 14 Sep 2025 03:53:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757822016; cv=none; b=UbN71hN3aMc/VuUzzIPIQw2DS3Nr62FyQCyDa3OV5lPt1l9WQIOxpfCZcFWto99siuZGI4GfI72tBIkan2O03v5wI66n9h0Fd9y2MkrxUZZR04VO4gMGSIkEafmhqdWYwDNJB1unne27nUFpxO6wTIZzgO26RX3KdsSN4TAIWKg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757822016; c=relaxed/simple; bh=FZoweijhihxtu6HrPrxAC18gjv4DF8N0f7D122SferU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Thnbn/GuYzIgRWCtH/Sh2HD9UJqUfiL7pqsp5X+RbES14YYtuV3uljSu318rTAS5JzFZLd2OHQh6v1WAmF18PM9ZRqYeqmIvvNlNMGCLEmfbo9GPAUj8pL8itb+QAkhq57SPfhsaYPDUW088+e6e7fB2YTewZ7TneLg4hPnkAck= 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=lnfVFf76; arc=none smtp.client-ip=209.85.208.43 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="lnfVFf76" Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-62ef469bb2cso2847379a12.2 for ; Sat, 13 Sep 2025 20:53:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757822013; x=1758426813; 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=PB2E9PPBAv72v29AyxICCzYyZlb0WEV+ovfXoPOatKs=; b=lnfVFf762khiYz0FDgghMlXPGvOITxGCtk+wu9qrbN5hxLRAJ1gs2+ppk7BKe0HXlG G5OREfPjiRmY8EwPfB8G4xt1X/oakdJZUIVKAQidEaQcGSNKY/+M0I9BNsBTVp63txq9 mWNSh2WPW1lcIW6EbcZonrtOLr+rPOcWu02CjDYUuTOSmFZo9hjdGaUQTIax5JlCS+NZ TNYxrphaJHRheaHZZPcAmZYwIMBqEB73xXkFvBqUDa4R/U5otIgxVvxeHp4zNeeaJNCP 7lKrRo7Ge+7IBKugxANcXh/v7/I3r3NwkZPsvZtjWj9jftx6y6vKzysCIfWd+kJWivtX fbww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757822013; x=1758426813; 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=PB2E9PPBAv72v29AyxICCzYyZlb0WEV+ovfXoPOatKs=; b=j7W7AIcIA+7E9e7lUXdrTOwjIOe/eZAaxbFWFaAJgMRf00J4Ipt0wYsdZeNTOJGw11 0Ys2kdj7HL/yi4ozQq6HFr3zvDogaS+YGYN02HE4j1CmunVv+F6W/u5+oBTjMEh5aBco KI76R2V68Eok/H7GpDkBmbKGT0XhNUol0u7Enscui8L614RhJ8epw5bcqnXI65Ie4DAt 6LxNC2hKoU9WThH8TLIyyVRYlD4c23HmN8XOlZDhBwlXMhWju7vS9wafXj4jwXfORBwo 6jAMb8Mbvyy6m20CildNcPdHdg8nmRmJeacCnoeG7AbW2At+E0vZciKpQKUVeUv93Tax zWEQ== X-Forwarded-Encrypted: i=1; AJvYcCWq2a4VpVniDjwQfQihEY6hFcVUrpFKJbsoaMrLs90El2yf6fgBuEOuVee4ywZtGNusMRxPZfLMZSxJrjk=@vger.kernel.org X-Gm-Message-State: AOJu0YyQgAXaYCr/qCCz2udz+NjeJpye66b988m/+dgulkg/azbmQSiw BBA4Pb6imzkX3a/SjQ+a1ZYYCJn5zVPDTDZFqmxAtgdEOl3bGcqxnbYp X-Gm-Gg: ASbGnctwY76K/z3+MkXsDUODnBYAz+L5FK/XFxUR3eF74GZRo760GpD8wWWHZYJ60MJ EDVNWQuF5JQLc8lXzX37+2AS8k5Nenu198eTytMlF5AqpGaOTSgD2lYY3MDmuhWZIaNjRPt6CF8 zZxzb/1LRROt3i9zVp1zHl6dOHhcr+kpDr/TtjDSfE+1HKo9SScxO5jxnAy+hbkyrL0ageI0A9v Hk1xf8v4b+lLVtaKsOIVDWfHZTpnyJLPnpdOaViIxtlI11hcTzsXy0aIqAI1FtNioXTRN7PCXvj h6pjVw5OujduAnCm5tyTEB3Gj8GSvJopDZmtTG3lsBryRqmnwFCzjKGDLwchaKVOLQTabo+lERY jI1l34mLL13JoNDCX/5ifWYGW5g2E8A== X-Google-Smtp-Source: AGHT+IGUQXhZVcMzH5x4qrxgNQpCZ4sYyZ3ugDsvfNumu2I8pECs9df4oC+H+CMnm997jPnr5crTug== X-Received: by 2002:a05:6402:2111:b0:61d:2096:1e92 with SMTP id 4fb4d7f45d1cf-62ed82614c4mr7020136a12.15.1757822012514; Sat, 13 Sep 2025 20:53:32 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id 4fb4d7f45d1cf-62ec33f3a5esm6570485a12.30.2025.09.13.20.53.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 13 Sep 2025 20:53:32 -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 43/62] setsid: inline ksys_setsid into the only caller Date: Sun, 14 Sep 2025 06:53:26 +0300 Message-ID: <20250914035326.3661003-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is cleanup after initrd removal Signed-off-by: Askar Safin --- include/linux/syscalls.h | 1 - kernel/sys.c | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 77f45e5d4413..75e9ee03d19b 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -1231,7 +1231,6 @@ int ksys_fchown(unsigned int fd, uid_t user, gid_t gr= oup); ssize_t ksys_read(unsigned int fd, char __user *buf, size_t count); void ksys_sync(void); int ksys_unshare(unsigned long unshare_flags); -int ksys_setsid(void); int ksys_sync_file_range(int fd, loff_t offset, loff_t nbytes, unsigned int flags); ssize_t ksys_pread64(unsigned int fd, char __user *buf, size_t count, diff --git a/kernel/sys.c b/kernel/sys.c index 1e28b40053ce..66e1e2dfd585 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -1265,7 +1265,7 @@ static void set_special_pids(struct pid **pids, struc= t pid *pid) change_pid(pids, curr, PIDTYPE_PGID, pid); } =20 -int ksys_setsid(void) +SYSCALL_DEFINE0(setsid) { struct task_struct *group_leader =3D current->group_leader; struct pid *sid =3D task_pid(group_leader); @@ -1300,11 +1300,6 @@ int ksys_setsid(void) return err; } =20 -SYSCALL_DEFINE0(setsid) -{ - return ksys_setsid(); -} - DECLARE_RWSEM(uts_sem); =20 #ifdef COMPAT_UTS_MACHINE --=20 2.47.2 From nobody Thu Oct 2 17:52:06 2025 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (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 A8AB825B2FA for ; Sun, 14 Sep 2025 03:54:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757822052; cv=none; b=SPAO0xSpmMb5oxcwGSBCUV/apFjVDPidthE7LdNMxq+AdJxTLZ7bj2ejG6OVpLDF+G37OfL2w5kh1dNjk/xHo2W08IoYBBQTd8E5CeeHtd73QfOfTg0nO5rAk9l2iGxQNrSZPZfSOvrlexUTzEW48q3iiTTgbxPS4iWFG1EUcxY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757822052; c=relaxed/simple; bh=E3G8T/3zLMm3x5kad8USEbJCkxfjt487WTCm3NfxUQM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Xfxj5nwo0ieU4X9yw0BBbBLm62/97S3r35DT1ol9IQxLRIJDvngmg2sK3i8sFqdn6TVUODlUpvSKpXdVV37aH3MNtfnqxEPLsQL0ZzSO1ihV9esJoj8kjjl1n+t0QDCnARmiZJ1jau5K3VvxWi/28cZ/2Chg/mnsg1VHwAecFbc= 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=m7q9EjnF; arc=none smtp.client-ip=209.85.218.41 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="m7q9EjnF" Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-b042eb09948so660047666b.3 for ; Sat, 13 Sep 2025 20:54:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757822048; x=1758426848; 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=U0YiDU4Bzw7IKNW2/fgCfvKW6iRx1DQ4l7Ssn455PQA=; b=m7q9EjnFFJXZKnnJWAuHewuPVuFM6vjLTLUvGfzyzdImBQ++EznbIWQrk7ZI2edCxN ABVvHSn4RknXX5w6azOwuYHGkiavtI++cDhw2VB+z9yMG4LKQot3louLK0jFpgqq1FWv Q78TRjdvR0Cw/rFvCF6EeApx0C0A+QEIwW3wsoRz53U0346Ms0IAbOFiBo7TQKjy2D0H 6fAS2QfZ95SJNv8tL8ibrMA8/T7EUfTK9KZRsSZi0NwfZi/1IKHCtEKzDysYdoxQDCFa Jvp3JCGDTMjnFlQzVxYRvv7qTI5TjZp2QRR+sCsbevZnJUnSRA7koomaDueq5ksTsrH3 uUqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757822048; x=1758426848; 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=U0YiDU4Bzw7IKNW2/fgCfvKW6iRx1DQ4l7Ssn455PQA=; b=HNQXrfwf444Rrdwi0JHWvHmdXCYczRA0DWkiY3CmhzpOLYalntR8yc0mxNWmujj41o CySAIv9RV16+izUXYegAnZpMORJj34eKd1MP3sCALNKef1FQg37aWLaaF+nPjMzSGDCk jKcglWFxixViz6JW9S5L4WYsRWG97yiQ7bXatpaLnJmdwZ8EnmDVg5cZ1tMWLQPpeYBA VBEssPZ44pIP+AF3iiUQ6gKnNjkh7g6LpkEhbSP66eOb4Ac/VL+gjvKexbv3UzLHVofU +ZasGhW0FYlzdBT0WhP2ETTch897uN7Bs4PPl7c0nqwciqyW+od/OXo55dtNkjHx7C3F Xz8A== X-Forwarded-Encrypted: i=1; AJvYcCWoYUyJiEYYd8UJaC4TdNnc4v74Owhbo+FtfUd3Y8qNakzrzDzB3Wq6InSH7Eixdfy8JR1T/KY7SptcCrM=@vger.kernel.org X-Gm-Message-State: AOJu0Yxmay1HVotU5WdRyudft/0Nf6ZoqaYdDmrsBFUDUd4OS9Kw7HAe xB/ZQ+1Ye8wECIz4XQ0hKPFzi6xNnjfd3//uy89fswJzyQrPWMEUxsuW X-Gm-Gg: ASbGnctyXN3aalnyUqnJ4PG7t/g8GlrcVZA7ix9m5pZAsBnKbqVqAiMwIyw3FO8gEa3 NMt7Fdo6I2DoPf7r/776OHjVqjMsZVC3txH8hN8Sj2+5YzQMgNP8p8CcLCoqkr0wykA9uXzoUBl 3aIaN8qHmAWweadF05HzFK/kHfD9eOE+A+6bfjsjAAdaxDp6KPM24MUQPCSpMlZtceRThJv8z5o npskPgbznmE4m6swVi1+ktFN69ttOXiN/KU/3QFmfVkeupCZhWr+7rSC0NwBHLRvhU1has1tm3S 7hd7Fxis1U4nXnkduvoJWmHEXiObDqyJO33jzHA3m4XXZTwk1ko2WL6C+IaOjVH8xsQHkfASQkt iMbwexzL/Svshru/LM13woXP69kKkxw== X-Google-Smtp-Source: AGHT+IEVLkeZlLSkzoTpPLzlBRvNTQ9m/bl133jXYp2zZldNvB+tlYKH8pXYzZ5ISfOO2+UjGM6RFg== X-Received: by 2002:a17:907:e8d:b0:b0e:3d88:27fd with SMTP id a640c23a62f3a-b0e3d97e027mr75192266b.8.1757822048020; Sat, 13 Sep 2025 20:54:08 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07da7a8918sm303079766b.56.2025.09.13.20.54.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 13 Sep 2025 20:54:07 -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 44/62] doc: kernel-parameters: remove [RAM] from reserve_mem= Date: Sun, 14 Sep 2025 06:54:02 +0300 Message-ID: <20250914035402.3670906-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This parameter has nothing to do with ramdisk Signed-off-by: Askar Safin --- Documentation/admin-guide/kernel-parameters.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentatio= n/admin-guide/kernel-parameters.txt index a259f2bdba0f..0805d3ebc75a 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -6277,8 +6277,7 @@ them. If is less than 0x10000, the region is assumed to be I/O ports; otherwise it is memory. =20 - reserve_mem=3D [RAM] - Format: nn[KMG]::