Merge tag 'block-6.9-20240322' of git://git.kernel.dk/linux

[linux-2.6-block.git] / kernel / utsname_sysctl.c

diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
index f50398cb790d736c28d10fd03b70c5786ed07693..019e3a1566cf56095476bcdc371a3240506766fc 100644 (file)
--- a/kernel/utsname_sysctl.c
+++ b/kernel/utsname_sysctl.c
@@ -123,15 +123,6 @@ static struct ctl_table uts_kern_table[] = {
        {}
 };
 
-static struct ctl_table uts_root_table[] = {
-       {
-               .procname       = "kernel",
-               .mode           = 0555,
-               .child          = uts_kern_table,
-       },
-       {}
-};
-
 #ifdef CONFIG_PROC_SYSCTL
 /*
  * Notify userspace about a change in a certain entry of uts_kern_table,
@@ -147,7 +138,7 @@ void uts_proc_notify(enum uts_proc proc)
 
 static int __init utsname_sysctl_init(void)
 {
-       register_sysctl_table(uts_root_table);
+       register_sysctl("kernel", uts_kern_table);
        return 0;
 }