diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-12-22 02:10:01 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-12-22 02:10:01 -0500 |
| commit | 752a4a95e3c96a8e8d3405b16d292f13e8c7856b (patch) | |
| tree | 838e43696fdc45b83f082eef7230d79cfe699497 /kernel/sysctl.c | |
| parent | bc3f67a3e1b20756d4bfa5886a6b8fd0c068e6a4 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge commit 'v2.6.37-rc7' into spi/next
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..5abfa1518554 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -702,6 +702,15 @@ static struct ctl_table kern_table[] = { | |||
| 702 | .extra1 = &zero, | 702 | .extra1 = &zero, |
| 703 | .extra2 = &ten_thousand, | 703 | .extra2 = &ten_thousand, |
| 704 | }, | 704 | }, |
| 705 | { | ||
| 706 | .procname = "dmesg_restrict", | ||
| 707 | .data = &dmesg_restrict, | ||
| 708 | .maxlen = sizeof(int), | ||
| 709 | .mode = 0644, | ||
| 710 | .proc_handler = proc_dointvec_minmax, | ||
| 711 | .extra1 = &zero, | ||
| 712 | .extra2 = &one, | ||
| 713 | }, | ||
| 705 | #endif | 714 | #endif |
| 706 | { | 715 | { |
| 707 | .procname = "ngroups_max", | 716 | .procname = "ngroups_max", |