diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
| commit | 87d721ad7a37b7650dd710c88dd5c6a5bf9fe996 (patch) | |
| tree | 869d633803eb7c429624d3bd16a6117816849763 /arch/arm/kernel/entry-common.S | |
| parent | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (diff) | |
| parent | b7cfda9fc3d7aa60cffab5367f2a72a4a70060cd (diff) | |
Merge branch 'master' into devel
Diffstat (limited to 'arch/arm/kernel/entry-common.S')
| -rw-r--r-- | arch/arm/kernel/entry-common.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 3657c5328a5b..c71818bdf2cc 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S | |||
| @@ -153,7 +153,7 @@ trace: | |||
| 153 | sub r0, r0, #MCOUNT_INSN_SIZE | 153 | sub r0, r0, #MCOUNT_INSN_SIZE |
| 154 | mov lr, pc | 154 | mov lr, pc |
| 155 | mov pc, r2 | 155 | mov pc, r2 |
| 156 | mov lr, r1 @ restore lr | 156 | ldr lr, [fp, #-4] @ restore lr |
| 157 | ldmia sp!, {r0-r3, pc} | 157 | ldmia sp!, {r0-r3, pc} |
| 158 | 158 | ||
| 159 | #endif /* CONFIG_DYNAMIC_FTRACE */ | 159 | #endif /* CONFIG_DYNAMIC_FTRACE */ |