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

[linux-block.git] / security / yama / yama_lsm.c

diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c
index 478be269571ab167106032402139e2776a4e71d7..2503cf153d4ad80a28be9869c81fe17b6849897f 100644 (file)
--- a/security/yama/yama_lsm.c
+++ b/security/yama/yama_lsm.c
@@ -447,12 +447,6 @@ static int yama_dointvec_minmax(struct ctl_table *table, int write,
 
 static int max_scope = YAMA_SCOPE_NO_ATTACH;
 
-static struct ctl_path yama_sysctl_path[] = {
-       { .procname = "kernel", },
-       { .procname = "yama", },
-       { }
-};
-
 static struct ctl_table yama_sysctl_table[] = {
        {
                .procname       = "ptrace_scope",
@@ -467,7 +461,7 @@ static struct ctl_table yama_sysctl_table[] = {
 };
 static void __init yama_init_sysctl(void)
 {
-       if (!register_sysctl_paths(yama_sysctl_path, yama_sysctl_table))
+       if (!register_sysctl("kernel/yama", yama_sysctl_table))
                panic("Yama: sysctl registration failed.\n");
 }
 #else