TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4

Browse Source 
Fix NR_IPI to be 7 instead of 6 because both googly and core add
an IPI.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

Conflicts:
	arch/arm/Kconfig
	arch/arm/common/Makefile
	arch/arm/include/asm/hardware/cache-l2x0.h
	arch/arm/mm/cache-l2x0.c
	arch/arm/mm/mmu.c
	include/linux/wakelock.h
	kernel/power/Kconfig
	kernel/power/Makefile
	kernel/power/main.c
	kernel/power/power.h
This commit is contained in:
Stephen Boyd
2013-02-25 10:53:49 -08:00
parent afd1637770 c47bd78326
commit 84d1c1a3a3
420 changed files with 121159 additions and 1349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/sysctl.c
View File

@@ -102,6 +102,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;
@@ -1218,6 +1219,13 @@ static struct ctl_table vm_table[] = {
.proc_handler = min_free_kbytes_sysctl_handler,
.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,