diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-18 06:31:14 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-18 06:31:14 -0500 |
| commit | 3b0eb4a195a124567cd0dd6f700f8388def542c6 (patch) | |
| tree | a5302057b2d2bdfb2072cb2ff0df9e1c0990345c /arch/arm/kernel | |
| parent | 8213084125eed3c5efbc5e13739b93dfedb88590 (diff) | |
| parent | 588ef7693574cfbcb228f48d5478c2b39a9b0c9f (diff) | |
Merge the easy part of the IOP branch
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/traps.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 329609b84d3b..24095601359b 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c | |||
| @@ -282,7 +282,10 @@ asmlinkage void do_undefinstr(struct pt_regs *regs) | |||
| 282 | regs->ARM_pc -= correction; | 282 | regs->ARM_pc -= correction; |
| 283 | 283 | ||
| 284 | pc = (void __user *)instruction_pointer(regs); | 284 | pc = (void __user *)instruction_pointer(regs); |
| 285 | if (thumb_mode(regs)) { | 285 | |
| 286 | if (processor_mode(regs) == SVC_MODE) { | ||
| 287 | instr = *(u32 *) pc; | ||
| 288 | } else if (thumb_mode(regs)) { | ||
| 286 | get_user(instr, (u16 __user *)pc); | 289 | get_user(instr, (u16 __user *)pc); |
| 287 | } else { | 290 | } else { |
| 288 | get_user(instr, (u32 __user *)pc); | 291 | get_user(instr, (u32 __user *)pc); |