diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-01-05 08:22:08 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-05 08:22:10 -0500 |
| commit | aef1b9cef78ae65c6501850851cc3f61f9be477b (patch) | |
| tree | 9769972983e84620df17c13b73f70a8341c4b125 /arch/arm/kernel/entry-common.S | |
| parent | 20c457b8587bee4644d998331d9e13be82e05b4c (diff) | |
| parent | 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 (diff) | |
Merge commit 'v2.6.37' into perf/core
Merge reason: Add the final .37 tree.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/kernel/entry-common.S')
| -rw-r--r-- | arch/arm/kernel/entry-common.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 8bfa98757cd2..80bf8cd88d7c 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S | |||
| @@ -29,6 +29,9 @@ ret_fast_syscall: | |||
| 29 | ldr r1, [tsk, #TI_FLAGS] | 29 | ldr r1, [tsk, #TI_FLAGS] |
| 30 | tst r1, #_TIF_WORK_MASK | 30 | tst r1, #_TIF_WORK_MASK |
| 31 | bne fast_work_pending | 31 | bne fast_work_pending |
| 32 | #if defined(CONFIG_IRQSOFF_TRACER) | ||
| 33 | asm_trace_hardirqs_on | ||
| 34 | #endif | ||
| 32 | 35 | ||
| 33 | /* perform architecture specific actions before user return */ | 36 | /* perform architecture specific actions before user return */ |
| 34 | arch_ret_to_user r1, lr | 37 | arch_ret_to_user r1, lr |
| @@ -65,6 +68,9 @@ ret_slow_syscall: | |||
| 65 | tst r1, #_TIF_WORK_MASK | 68 | tst r1, #_TIF_WORK_MASK |
| 66 | bne work_pending | 69 | bne work_pending |
| 67 | no_work_pending: | 70 | no_work_pending: |
| 71 | #if defined(CONFIG_IRQSOFF_TRACER) | ||
| 72 | asm_trace_hardirqs_on | ||
| 73 | #endif | ||
| 68 | /* perform architecture specific actions before user return */ | 74 | /* perform architecture specific actions before user return */ |
| 69 | arch_ret_to_user r1, lr | 75 | arch_ret_to_user r1, lr |
| 70 | 76 | ||