aboutsummaryrefslogtreecommitdiff
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-11 11:55:56 +0100
committerMark Brown <broonie@linaro.org>2013-08-11 11:55:56 +0100
commite9b3bd248b349433215cf01064a866b632fb3f4b (patch)
tree9821327345bdced3d895723cba1181d7ca399aca /kernel/sysctl.c
parent8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff)
parent80475b849b90d8bed1fe768c496280f4b5c11410 (diff)
Merge branch 'linaro-fixes/experimental/android-3.10' of git://git.linaro.org/people/jstultz/android into lsk-v3.10-jstultz
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r--kernel/sysctl.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 9edcf456e0f..1a07798c914 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -105,6 +105,7 @@ extern char core_pattern[];
extern unsigned int core_pipe_limit;
#endif
extern int pid_max;
+extern int min_free_order_shift;
extern int pid_max_min, pid_max_max;
extern int percpu_pagelist_fraction;
extern int compat_log;
@@ -1266,6 +1267,13 @@ static struct ctl_table vm_table[] = {
.extra1 = &zero,
},
{
+ .procname = "min_free_order_shift",
+ .data = &min_free_order_shift,
+ .maxlen = sizeof(min_free_order_shift),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+ },
+ {
.procname = "percpu_pagelist_fraction",
.data = &percpu_pagelist_fraction,
.maxlen = sizeof(percpu_pagelist_fraction),