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

3
include/linux/kernel.h
View File

@@ -705,6 +705,9 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
extern int do_sysinfo(struct sysinfo *info);
/* To identify board information in panic logs, set this */
extern char *mach_panic_string;
#endif /* __KERNEL__ */
#endif