diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 03:47:43 -0500 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 03:47:43 -0500 |
commit | 4ab0fbd3a29067e1540f05093ae4ed07645d18c8 (patch) | |
tree | 7f027e92e4578e293b20ac1f2c389600a795ea7f /kernel/sysctl.c | |
parent | f3c91c1deaf8493526d8216be94c33e963f00962 (diff) | |
parent | 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff) |
Merge remote branch 'linus' into drm-intel-fixes
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index b65bf634035e..5abfa1518554 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -702,7 +702,6 @@ static struct ctl_table kern_table[] = { | |||
702 | .extra1 = &zero, | 702 | .extra1 = &zero, |
703 | .extra2 = &ten_thousand, | 703 | .extra2 = &ten_thousand, |
704 | }, | 704 | }, |
705 | #endif | ||
706 | { | 705 | { |
707 | .procname = "dmesg_restrict", | 706 | .procname = "dmesg_restrict", |
708 | .data = &dmesg_restrict, | 707 | .data = &dmesg_restrict, |
@@ -712,6 +711,7 @@ static struct ctl_table kern_table[] = { | |||
712 | .extra1 = &zero, | 711 | .extra1 = &zero, |
713 | .extra2 = &one, | 712 | .extra2 = &one, |
714 | }, | 713 | }, |
714 | #endif | ||
715 | { | 715 | { |
716 | .procname = "ngroups_max", | 716 | .procname = "ngroups_max", |
717 | .data = &ngroups_max, | 717 | .data = &ngroups_max, |