diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
| commit | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (patch) | |
| tree | d827bca3fc825a0ac33efbcd493713be40fcc812 /arch/arm/kernel/unwind.c | |
| parent | cf7a2b4fb6a9b86779930a0a123b0df41aa9208f (diff) | |
| parent | f17a1f06d2fa93f4825be572622eb02c4894db4e (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
Diffstat (limited to 'arch/arm/kernel/unwind.c')
| -rw-r--r-- | arch/arm/kernel/unwind.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/unwind.c b/arch/arm/kernel/unwind.c index dd56e11f339a..39baf1128bfa 100644 --- a/arch/arm/kernel/unwind.c +++ b/arch/arm/kernel/unwind.c | |||
| @@ -62,7 +62,11 @@ struct unwind_ctrl_block { | |||
| 62 | }; | 62 | }; |
| 63 | 63 | ||
| 64 | enum regs { | 64 | enum regs { |
| 65 | #ifdef CONFIG_THUMB2_KERNEL | ||
| 66 | FP = 7, | ||
| 67 | #else | ||
| 65 | FP = 11, | 68 | FP = 11, |
| 69 | #endif | ||
| 66 | SP = 13, | 70 | SP = 13, |
| 67 | LR = 14, | 71 | LR = 14, |
| 68 | PC = 15 | 72 | PC = 15 |