diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-04-08 20:33:24 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-04-08 20:33:24 +1000 |
| commit | 28e0332a89f9ffbaf5735b1a6a75ddcd8929e194 (patch) | |
| tree | 0736f8717c90a211c8fd5b3a62472eceee6c38a7 /kernel/sysctl.c | |
| parent | 6aa61eea701ce3bf707f632fd2ced4e8410acd19 (diff) | |
| parent | f47d46143d3f5112742277c65aca632174d88b41 (diff) | |
| download | linux-next-28e0332a89f9ffbaf5735b1a6a75ddcd8929e194.tar.gz | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 7a299e90f94b..3601786ddaeb 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -2924,7 +2924,7 @@ static struct ctl_table vm_table[] = { #ifdef CONFIG_COMPACTION { .procname = "compact_memory", - .data = &sysctl_compact_memory, + .data = NULL, .maxlen = sizeof(int), .mode = 0200, .proc_handler = sysctl_compaction_handler, @@ -3346,7 +3346,7 @@ static struct ctl_table fs_table[] = { .procname = "protected_symlinks", .data = &sysctl_protected_symlinks, .maxlen = sizeof(int), - .mode = 0600, + .mode = 0644, .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_ONE, @@ -3355,7 +3355,7 @@ static struct ctl_table fs_table[] = { .procname = "protected_hardlinks", .data = &sysctl_protected_hardlinks, .maxlen = sizeof(int), - .mode = 0600, + .mode = 0644, .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_ONE, @@ -3364,7 +3364,7 @@ static struct ctl_table fs_table[] = { .procname = "protected_fifos", .data = &sysctl_protected_fifos, .maxlen = sizeof(int), - .mode = 0600, + .mode = 0644, .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ZERO, .extra2 = &two, @@ -3373,7 +3373,7 @@ static struct ctl_table fs_table[] = { .procname = "protected_regular", .data = &sysctl_protected_regular, .maxlen = sizeof(int), - .mode = 0600, + .mode = 0644, .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ZERO, .extra2 = &two, |