Merge tag 'sysctl-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof...

[tomoyo/tomoyo-test1.git] / drivers / hv / vmbus_drv.c

diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index 1ab4f91..734fff8 100644 (file)
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -1460,15 +1460,6 @@ static struct ctl_table hv_ctl_table[] = {
        {}
 };
 
-static struct ctl_table hv_root_table[] = {
-       {
-               .procname       = "kernel",
-               .mode           = 0555,
-               .child          = hv_ctl_table
-       },
-       {}
-};
-
 /*
  * vmbus_bus_init -Main vmbus driver initialization routine.
  *
@@ -1547,7 +1538,7 @@ static int vmbus_bus_init(void)
                 * message recording won't be available in isolated
                 * guests should the following registration fail.
                 */
-               hv_ctl_table_hdr = register_sysctl_table(hv_root_table);
+               hv_ctl_table_hdr = register_sysctl("kernel", hv_ctl_table);
                if (!hv_ctl_table_hdr)
                        pr_err("Hyper-V: sysctl table register error");