diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:51:56 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:51:56 -0800 |
| commit | 68529c0f36074be88ee937634fb9433e69c96388 (patch) | |
| tree | 00c842c0eff6a2b946e1c11a1bdf2d632535e0a7 /kernel/sysctl.c | |
| parent | f9a10833c7a12ce1244685eba88848bb88bbd43f (diff) | |
| parent | 3ac6e2e8106ac304c56b9435c907b2b3bda27a09 (diff) | |
Merge branch 'korg-android-tegra-3.1' into after-upstream-android
Conflicts:
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/board-ventana.c
drivers/misc/Kconfig
drivers/video/tegra/dc/hdmi.c
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 11d65b531e50..fd15163f360a 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -96,6 +96,7 @@ extern char core_pattern[]; extern unsigned int core_pipe_limit; extern int pid_max; extern int min_free_kbytes; +extern int min_free_order_shift; extern int pid_max_min, pid_max_max; extern int sysctl_drop_caches; extern int percpu_pagelist_fraction; @@ -1189,6 +1190,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), |