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

Merge branch 'master' into devel

Browse Source
This commit is contained in:
Russell King
2009-09-12 12:04:37 +01:00
committed by Russell King
parent ddd559b13f b7cfda9fc3
commit 87d721ad7a
908 changed files with 12595 additions and 7118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,7 +153,7 @@ trace:
sub r0, r0, #MCOUNT_INSN_SIZE
mov lr, pc
mov pc, r2
mov lr, r1 @ restore lr
ldr lr, [fp, #-4] @ restore lr
ldmia sp!, {r0-r3, pc}
#endif /* CONFIG_DYNAMIC_FTRACE */