xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable

Browse Source 
Conflicts:
	arch/arm/common/gic.c
	arch/arm/plat-omap/include/plat/common.h
This commit is contained in:
Russell King
2011-12-05 23:20:17 +00:00
parent ba8bb18a03 ae72fd588a
commit 742eaa6a6e
679 changed files with 7360 additions and 5347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/kernel/entry-armv.S
View File

@@ -496,7 +496,7 @@ ENDPROC(__und_usr)
.popsection
.pushsection __ex_table,"a"
.long 1b, 4b
#if __LINUX_ARM_ARCH__ >= 7
#if CONFIG_ARM_THUMB && __LINUX_ARM_ARCH__ >= 6 && CONFIG_CPU_V7
.long 2b, 4b
.long 3b, 4b
#endif