diff options
| author | Colin Cross <ccross@android.com> | 2011-01-06 18:12:22 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-01-06 18:12:22 -0800 |
| commit | 3051b1526aca9dc9262028a5dd443d1083364b95 (patch) | |
| tree | a0de7a1cad98f8fba8040eb5cc00bfe505498821 /arch/arm/kernel | |
| parent | 00756cc5246293c02669eb9c13f2245f3cfa2706 (diff) | |
| parent | 35a0841bb89837e1d3551acb4b0c5510b778d1be (diff) | |
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'arch/arm/kernel')
| -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 7885722bdf4e..c4a7050d878e 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -29,6 +29,9 @@ ret_fast_syscall: ldr r1, [tsk, #TI_FLAGS] tst r1, #_TIF_WORK_MASK bne fast_work_pending +#if defined(CONFIG_IRQSOFF_TRACER) + asm_trace_hardirqs_on +#endif /* perform architecture specific actions before user return */ arch_ret_to_user r1, lr @@ -65,6 +68,9 @@ ret_slow_syscall: tst r1, #_TIF_WORK_MASK bne work_pending no_work_pending: +#if defined(CONFIG_IRQSOFF_TRACER) + asm_trace_hardirqs_on +#endif /* perform architecture specific actions before user return */ arch_ret_to_user r1, lr |