Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
init: remove pointless Root_* values
Remove all unused defines, and just use the expanded versions for
the SCSI disk majors.
I've decided to keep Root_RAM0 even if it could be expanded as there
is a lot of special casing for it in the init code.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20230531125535.676098-6-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
authored by
Christoph Hellwig
and committed by
Jens Axboe
f5524c3f
cc89c63e
+4
-11
+1
-1
arch/alpha/kernel/setup.c
+1
-1
arch/alpha/kernel/setup.c
+1
-1
arch/ia64/kernel/setup.c
+1
-1
arch/ia64/kernel/setup.c
···
627
627
* is physical disk 1 partition 1 and the Linux root disk is
628
628
* physical disk 1 partition 2.
629
629
*/
630
-
ROOT_DEV = Root_SDA2; /* default to second partition on first drive */
630
+
ROOT_DEV = MKDEV(SCSI_DISK0_MAJOR, 2);
631
631
632
632
if (is_uv_system())
633
633
uv_setup(cmdline_p);
+2
-1
arch/powerpc/platforms/powermac/setup.c
+2
-1
arch/powerpc/platforms/powermac/setup.c
···
76
76
77
77
static int current_root_goodness = -1;
78
78
79
-
#define DEFAULT_ROOT_DEVICE Root_SDA1 /* sda1 - slightly silly choice */
79
+
/* sda1 - slightly silly choice */
80
+
#define DEFAULT_ROOT_DEVICE MKDEV(SCSI_DISK0_MAJOR, 1)
80
81
81
82
sys_ctrler_t sys_ctrler = SYS_CTRLER_UNKNOWN;
82
83
EXPORT_SYMBOL(sys_ctrler);
-8
include/linux/root_dev.h
-8
include/linux/root_dev.h
···
10
10
Root_NFS = MKDEV(UNNAMED_MAJOR, 255),
11
11
Root_CIFS = MKDEV(UNNAMED_MAJOR, 254),
12
12
Root_RAM0 = MKDEV(RAMDISK_MAJOR, 0),
13
-
Root_RAM1 = MKDEV(RAMDISK_MAJOR, 1),
14
-
Root_FD0 = MKDEV(FLOPPY_MAJOR, 0),
15
-
Root_HDA1 = MKDEV(IDE0_MAJOR, 1),
16
-
Root_HDA2 = MKDEV(IDE0_MAJOR, 2),
17
-
Root_SDA1 = MKDEV(SCSI_DISK0_MAJOR, 1),
18
-
Root_SDA2 = MKDEV(SCSI_DISK0_MAJOR, 2),
19
-
Root_HDC1 = MKDEV(IDE1_MAJOR, 1),
20
-
Root_SR0 = MKDEV(SCSI_CDROM_MAJOR, 0),
21
13
};
22
14
23
15
extern dev_t ROOT_DEV;