revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / arch / arm / kernel / entry-common.S

diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index ba5a2cdd4822b9200d95d42958033515f44fb72e..571b4ec71f6b5d0a346e1a018e8a6583a013bf38 100644 (file)
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -30,9 +30,6 @@ ENTRY(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
@@ -69,9 +66,6 @@ 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