diff options
| -rw-r--r-- | arch/arm/kernel/entry-common.S | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 3248cde504ed..6f37ddfadbfa 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S | |||
| @@ -35,9 +35,7 @@ ret_fast_syscall: | |||
| 35 | ldr r1, [tsk, #TI_FLAGS] | 35 | ldr r1, [tsk, #TI_FLAGS] |
| 36 | tst r1, #_TIF_WORK_MASK | 36 | tst r1, #_TIF_WORK_MASK |
| 37 | bne fast_work_pending | 37 | bne fast_work_pending |
| 38 | #if defined(CONFIG_IRQSOFF_TRACER) | ||
| 39 | asm_trace_hardirqs_on | 38 | asm_trace_hardirqs_on |
| 40 | #endif | ||
| 41 | 39 | ||
| 42 | /* perform architecture specific actions before user return */ | 40 | /* perform architecture specific actions before user return */ |
| 43 | arch_ret_to_user r1, lr | 41 | arch_ret_to_user r1, lr |
| @@ -71,9 +69,8 @@ ENTRY(ret_to_user_from_irq) | |||
| 71 | tst r1, #_TIF_WORK_MASK | 69 | tst r1, #_TIF_WORK_MASK |
| 72 | bne work_pending | 70 | bne work_pending |
| 73 | no_work_pending: | 71 | no_work_pending: |
| 74 | #if defined(CONFIG_IRQSOFF_TRACER) | ||
| 75 | asm_trace_hardirqs_on | 72 | asm_trace_hardirqs_on |
| 76 | #endif | 73 | |
| 77 | /* perform architecture specific actions before user return */ | 74 | /* perform architecture specific actions before user return */ |
| 78 | arch_ret_to_user r1, lr | 75 | arch_ret_to_user r1, lr |
| 79 | 76 | ||