diff options
Diffstat (limited to 'arch/sh/kernel')
-rw-r--r-- | arch/sh/kernel/cpu/sh5/entry.S | 2 | ||||
-rw-r--r-- | arch/sh/kernel/entry-common.S | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/kernel/cpu/sh5/entry.S b/arch/sh/kernel/cpu/sh5/entry.S index ca08e7f26a3a..bba331d5ef74 100644 --- a/arch/sh/kernel/cpu/sh5/entry.S +++ b/arch/sh/kernel/cpu/sh5/entry.S | |||
@@ -1300,7 +1300,7 @@ syscall_allowed: | |||
1300 | 1300 | ||
1301 | getcon KCR0, r2 | 1301 | getcon KCR0, r2 |
1302 | ld.l r2, TI_FLAGS, r4 | 1302 | ld.l r2, TI_FLAGS, r4 |
1303 | movi (_TIF_SYSCALL_TRACE | _TIF_SINGLESTEP | _TIF_SYSCALL_AUDIT), r6 | 1303 | movi _TIF_WORK_SYSCALL_MASK, r6 |
1304 | and r6, r4, r6 | 1304 | and r6, r4, r6 |
1305 | beq/l r6, ZERO, tr0 | 1305 | beq/l r6, ZERO, tr0 |
1306 | 1306 | ||
diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S index 5e0dd1933847..a34417c8ee0a 100644 --- a/arch/sh/kernel/entry-common.S +++ b/arch/sh/kernel/entry-common.S | |||
@@ -202,7 +202,7 @@ work_resched: | |||
202 | syscall_exit_work: | 202 | syscall_exit_work: |
203 | ! r0: current_thread_info->flags | 203 | ! r0: current_thread_info->flags |
204 | ! r8: current_thread_info | 204 | ! r8: current_thread_info |
205 | tst #_TIF_SYSCALL_TRACE | _TIF_SINGLESTEP | _TIF_SYSCALL_AUDIT, r0 | 205 | tst #_TIF_WORK_SYSCALL_MASK, r0 |
206 | bt/s work_pending | 206 | bt/s work_pending |
207 | tst #_TIF_NEED_RESCHED, r0 | 207 | tst #_TIF_NEED_RESCHED, r0 |
208 | #ifdef CONFIG_TRACE_IRQFLAGS | 208 | #ifdef CONFIG_TRACE_IRQFLAGS |
@@ -351,7 +351,7 @@ ENTRY(system_call) | |||
351 | ! | 351 | ! |
352 | get_current_thread_info r8, r10 | 352 | get_current_thread_info r8, r10 |
353 | mov.l @(TI_FLAGS,r8), r8 | 353 | mov.l @(TI_FLAGS,r8), r8 |
354 | mov #(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT), r10 | 354 | mov #_TIF_WORK_SYSCALL_MASK, r10 |
355 | tst r10, r8 | 355 | tst r10, r8 |
356 | bf syscall_trace_entry | 356 | bf syscall_trace_entry |
357 | ! | 357 | ! |