diff options
author | 2010-12-01 13:13:56 +0100 | |
---|---|---|
committer | 2010-12-01 13:13:56 +0100 | |
commit | 307991055b0ce65d53dc1eb501c456c10eb36360 (patch) | |
tree | 71bb9263dc71344e5d7b97ca6d5cf223f1f1a856 /kernel/sysctl.c | |
parent | initramfs: Really fix build break on symbol-prefixed archs (diff) | |
parent | [media] Fix Kconfig errors due to two visible menus (diff) | |
download | wireguard-linux-307991055b0ce65d53dc1eb501c456c10eb36360.tar.xz wireguard-linux-307991055b0ce65d53dc1eb501c456c10eb36360.zip |
Merge branch 'kconfig_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next into kbuild/rc-fixes
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index c33a1edb799f..b65bf634035e 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -704,6 +704,15 @@ static struct ctl_table kern_table[] = { }, #endif { + .procname = "dmesg_restrict", + .data = &dmesg_restrict, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec_minmax, + .extra1 = &zero, + .extra2 = &one, + }, + { .procname = "ngroups_max", .data = &ngroups_max, .maxlen = sizeof (int), |