Skip to content

Commit a792a09

Browse files
Askar Safinkawasaki
authored andcommitted
init: remove /proc/sys/kernel/real-root-dev
It is not used anymore. Signed-off-by: Askar Safin <[email protected]>
1 parent 2337146 commit a792a09

File tree

3 files changed

+0
-27
lines changed

3 files changed

+0
-27
lines changed

Documentation/admin-guide/sysctl/kernel.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,12 +1215,6 @@ that support this feature.
12151215
== ===========================================================================
12161216

12171217

1218-
real-root-dev
1219-
=============
1220-
1221-
See Documentation/admin-guide/initrd.rst.
1222-
1223-
12241218
reboot-cmd (SPARC only)
12251219
=======================
12261220

include/uapi/linux/sysctl.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ enum
9292
KERN_DOMAINNAME=8, /* string: domainname */
9393

9494
KERN_PANIC=15, /* int: panic timeout */
95-
KERN_REALROOTDEV=16, /* real root device to mount after initrd */
9695

9796
KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
9897
KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */

init/do_mounts_initrd.c

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,11 @@
88

99
unsigned long initrd_start, initrd_end;
1010
int initrd_below_start_ok;
11-
static unsigned int real_root_dev; /* do_proc_dointvec cannot handle kdev_t */
1211
static int __initdata mount_initrd = 1;
1312

1413
phys_addr_t phys_initrd_start __initdata;
1514
unsigned long phys_initrd_size __initdata;
1615

17-
#ifdef CONFIG_SYSCTL
18-
static const struct ctl_table kern_do_mounts_initrd_table[] = {
19-
{
20-
.procname = "real-root-dev",
21-
.data = &real_root_dev,
22-
.maxlen = sizeof(int),
23-
.mode = 0644,
24-
.proc_handler = proc_dointvec,
25-
},
26-
};
27-
28-
static __init int kernel_do_mounts_initrd_sysctls_init(void)
29-
{
30-
register_sysctl_init("kernel", kern_do_mounts_initrd_table);
31-
return 0;
32-
}
33-
late_initcall(kernel_do_mounts_initrd_sysctls_init);
34-
#endif /* CONFIG_SYSCTL */
35-
3616
static int __init no_initrd(char *str)
3717
{
3818
pr_warn("noinitrd option is deprecated and will be removed soon\n");

0 commit comments

Comments
 (0)