From mboxrd@z Thu Jan 1 00:00:00 1970 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 4C9A914B953 for ; Sat, 13 Sep 2025 00:55:20 +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=1757724924; cv=none; b=PmoXUA7nJB/wKxK9R4HX+K3OuYTr8QT+ijNunhFHUc9om1FPf9TXU1E6Fjx8LDaBJWeIENR7kCsXX6Fs9zJynkAVcSsoobP3CukF5sdKinFVOhgrnddx0Xvgsnlt91XhhskpddcpEBdLs6Z5le0l5IOY9DEiKpEtsgca1jeTwlE= 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=hza+cduh; 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="hza+cduh" Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-b02c719a117so428953166b.1 for ; Fri, 12 Sep 2025 17:55:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757724919; x=1758329719; darn=lists.linux.dev; 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=hza+cduhwb1i2PJz9Q7K48ELyTqO8Q4LbLlLU3kxMQyezXZ6Qzfst8vciQ/2fpEIoT dKWFE84iLrL5j8yO/2TziZuEC2iXQEy8lTzXJTy7sVa33hSuBkO/nZYJkEzsNUrMbpEb 2Nmi7lX6SmGA1aqjd9Z6ke7lralArQNChJ0WwcZUQ4Z4Nl1ljnNwDGe/Pq4K0bAfrN8E SoUVRW0Bup7jUZlsdy39ukG9dKPS9lCTagP7cg5O3/CR9oD9YwK1qY1paBm3amT4xT9+ VaV7qSXJUc7PVXl6lCNbD7xnnJOrq05hrtWYaBkbAN3kbwEtyPxtkSMSZ/A+HYnWmSzh F8QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757724919; x=1758329719; 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=nsnIqmdIoOOTOUvetknFO0vwZ+ZkeYNkumghc9XBz5Bin6vx/3+CBLcSBqT+VvCmSC PpOWmUQFGb4exzM0ceVMlA52SxkAfdaGEePy4fDNqBmG2HTDP4qmadbcO+CGxdXCl4t0 x6jAPoDf1hPPR94GxCgSwNZhI1jrwt1MgEtX2ozaM5aSIlL6CGjG6ZJJ+Rfj2Dr3UrIO 1QoN3erdwcnfOGIJp+SnQTCmy25jE3RzUXVXInZKz2eeT7Gp9fEaxy04ho7H6M1w/yKw r1fSaooL1ZRZiyaysGPr44PuFhGndTzPSLfBWN+WF8ow6V42r6tMTikPNifcm89pJ3GF EgCw== X-Forwarded-Encrypted: i=1; AJvYcCWbEm8Mlqiu3l9w67ghAUTBRep7GXAAY+YFeiNPwMA9K7g1x/EHAnqpW6+MrexfTBczlnZnf+Hr@lists.linux.dev X-Gm-Message-State: AOJu0YzgHct3h69jnEttxZXc/eF45LsO7h1+Z/g+scLC2/luIDd031cr GzKIrRuIjaVLOD1WsQrNCa4bO5PMVN1D6ZeB/7s8DYXwEgdk3F5NiSYy X-Gm-Gg: ASbGncv9pE8pAjQV7izHXINYPAPc+Ua9Gm/GLFoV7y5wtmAGSidIxlqDYiOaJgkLghD QxonBNqL9oP4rGxE4VAb6yv58T9MY4ljhTvFUxtlS8if3ceBmct09225fnHStZACS0s/ezeZ6/d aJVo7DWd80wPNDVF5U3w3ueGdbU2Pxzny0YhFSCqxT0ZidjaA1kJy6kX/GOWOzHllZxszbCJ0sU 3TmD8Drj00DIOSKSBzS6/5WyRRkQ+ZibScfp+xnGGbBhwKWpN294vCECjlMYEF8NMUTDBlxN+iI BOqRKfgAbHwQ/kVMYc7SCiC0XmPVSzRYyplL3PSoTrB7OLfZ8Eem6WGN77LzQsp5OyMzD2kM9EM S1o9gRMJZ+VKwBBL0oLUZpUeb4gFYxA== 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: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 = uboot_initrd_start; initrd_end = uboot_initrd_end; - ROOT_DEV = 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; } - ROOT_DEV = Root_RAM0; return PFN_UP(end); disable: initrd_start = 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=0x%lx initrd_end=0x%lx\n", initrd_start, initrd_end); - /* 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 = Root_RAM0; - else + if (!(is_kernel_addr(initrd_start) && is_kernel_addr(initrd_end) && + initrd_end > initrd_start)) initrd_start = initrd_end = 0; 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); DBG(" <- check_for_initrd()\n"); #endif /* CONFIG_BLK_DEV_INITRD */ diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/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 = Root_RAM0; - else + if (!initrd_start) #endif ROOT_DEV = 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 = boot_command_line; - ROOT_DEV = Root_RAM0; - setup_initial_init_mm(_text, _etext, _edata, _end); 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) /* * 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 = Root_RAM0; /* * 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 = MKDEV(UNNAMED_MAJOR, 255), Root_CIFS = MKDEV(UNNAMED_MAJOR, 254), Root_Generic = MKDEV(UNNAMED_MAJOR, 253), - Root_RAM0 = MKDEV(RAMDISK_MAJOR, 0), }; 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") == 0) return Root_CIFS; - if (strcmp(root_device_name, "/dev/ram") == 0) - return Root_RAM0; error = early_lookup_bdev(root_device_name, &dev); if (error) { -- 2.47.2