|
@@ -35,9 +35,7 @@ ret_fast_syscall:
|
|
ldr r1, [tsk, #TI_FLAGS]
|
|
ldr r1, [tsk, #TI_FLAGS]
|
|
tst r1, #_TIF_WORK_MASK
|
|
tst r1, #_TIF_WORK_MASK
|
|
bne fast_work_pending
|
|
bne fast_work_pending
|
|
-#if defined(CONFIG_IRQSOFF_TRACER)
|
|
|
|
asm_trace_hardirqs_on
|
|
asm_trace_hardirqs_on
|
|
-#endif
|
|
|
|
|
|
|
|
/* perform architecture specific actions before user return */
|
|
/* perform architecture specific actions before user return */
|
|
arch_ret_to_user r1, lr
|
|
arch_ret_to_user r1, lr
|
|
@@ -71,9 +69,8 @@ ENTRY(ret_to_user_from_irq)
|
|
tst r1, #_TIF_WORK_MASK
|
|
tst r1, #_TIF_WORK_MASK
|
|
bne work_pending
|
|
bne work_pending
|
|
no_work_pending:
|
|
no_work_pending:
|
|
-#if defined(CONFIG_IRQSOFF_TRACER)
|
|
|
|
asm_trace_hardirqs_on
|
|
asm_trace_hardirqs_on
|
|
-#endif
|
|
|
|
|
|
+
|
|
/* perform architecture specific actions before user return */
|
|
/* perform architecture specific actions before user return */
|
|
arch_ret_to_user r1, lr
|
|
arch_ret_to_user r1, lr
|
|
|
|
|