diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-12-01 07:13:56 -0500 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-12-01 07:13:56 -0500 |
| commit | 307991055b0ce65d53dc1eb501c456c10eb36360 (patch) | |
| tree | 71bb9263dc71344e5d7b97ca6d5cf223f1f1a856 /kernel/sysctl.c | |
| parent | 1198c6d45a1ef5f4f7fdfbf33ef7d270493ec575 (diff) | |
| parent | 9b4320b77bab4031649c484da1c595f39c2e43cd (diff) | |
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[] = { | |||
| 704 | }, | 704 | }, |
| 705 | #endif | 705 | #endif |
| 706 | { | 706 | { |
| 707 | .procname = "dmesg_restrict", | ||
| 708 | .data = &dmesg_restrict, | ||
| 709 | .maxlen = sizeof(int), | ||
| 710 | .mode = 0644, | ||
| 711 | .proc_handler = proc_dointvec_minmax, | ||
| 712 | .extra1 = &zero, | ||
| 713 | .extra2 = &one, | ||
| 714 | }, | ||
| 715 | { | ||
| 707 | .procname = "ngroups_max", | 716 | .procname = "ngroups_max", |
| 708 | .data = &ngroups_max, | 717 | .data = &ngroups_max, |
| 709 | .maxlen = sizeof (int), | 718 | .maxlen = sizeof (int), |