diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-07 10:08:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-07 10:08:33 -0800 |
| commit | d694c16bc332c7e706f44e3d10bea06228166a6f (patch) | |
| tree | 72d0ab61ce633002a1c4de2406101e28e101afa3 /arch/sh/kernel/entry-common.S | |
| parent | d04f41e35343f1d788551fd3f753f51794f4afcf (diff) | |
| parent | ccd45ad405bcb1504bd923bd0487902374c942c8 (diff) | |
| download | blackbird-obmc-linux-d694c16bc332c7e706f44e3d10bea06228166a6f.tar.gz blackbird-obmc-linux-d694c16bc332c7e706f44e3d10bea06228166a6f.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Kill off I/O cruft for R7780RP.
sh: Revert lazy dcache writeback changes.
sh: Enable SM501 support for RTS7751R2D.
sh: Use L1_CACHE_BYTES for .data.cacheline_aligned.
sysctl: Support vdso_enabled sysctl on SH.
sh: Fix kernel thread stack corruption with preempt.
doc: Add SH to vdso and earlyprintk in kernel-parameters.txt
sh: Fix sigmask trampling in signal delivery.
sh: Clear UBC when not in use.
Diffstat (limited to 'arch/sh/kernel/entry-common.S')
| -rw-r--r-- | arch/sh/kernel/entry-common.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S index ab4ebb856c2a..b46728027195 100644 --- a/arch/sh/kernel/entry-common.S +++ b/arch/sh/kernel/entry-common.S @@ -224,7 +224,7 @@ work_resched: syscall_exit_work: ! r0: current_thread_info->flags ! r8: current_thread_info - tst #_TIF_SYSCALL_TRACE, r0 + tst #_TIF_SYSCALL_TRACE | _TIF_SINGLESTEP, r0 bt/s work_pending tst #_TIF_NEED_RESCHED, r0 #ifdef CONFIG_TRACE_IRQFLAGS |
