diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-14 23:54:00 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-14 23:54:00 -0500 |
| commit | 344ac148442e3223ac1b0e29ef3d3fb73c5ed61a (patch) | |
| tree | 7b654a74727c57344296768c3a2d7d03b17f37ea /kernel/sysctl.c | |
| parent | 8ac5ba61cb1a80df407f2cdedb28b28d3b1d84ec (diff) | |
| parent | 0143832cc96d0bf78486297aad5c8fb2c2ead02a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/urgent
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), |