diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/m68k/kernel/entry.S | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/m68k/kernel/entry.S')
| -rw-r--r-- | arch/m68k/kernel/entry.S | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S index c5b33634c98..77fc7c16bf4 100644 --- a/arch/m68k/kernel/entry.S +++ b/arch/m68k/kernel/entry.S | |||
| @@ -179,7 +179,11 @@ do_signal_return: | |||
| 179 | addql #8,%sp | 179 | addql #8,%sp |
| 180 | RESTORE_SWITCH_STACK | 180 | RESTORE_SWITCH_STACK |
| 181 | addql #4,%sp | 181 | addql #4,%sp |
| 182 | jbra resume_userspace | 182 | tstl %d0 |
| 183 | jeq resume_userspace | ||
| 184 | | when single stepping into handler stop at the first insn | ||
| 185 | btst #6,%curptr@(TASK_INFO+TINFO_FLAGS+2) | ||
| 186 | jeq resume_userspace | ||
| 183 | 187 | ||
| 184 | do_delayed_trace: | 188 | do_delayed_trace: |
| 185 | bclr #7,%sp@(PT_OFF_SR) | clear trace bit in SR | 189 | bclr #7,%sp@(PT_OFF_SR) | clear trace bit in SR |