Skip to content

Commit

Permalink
ARM: entry-common: get rid of unnecessary ifdefs
Browse files Browse the repository at this point in the history
The contents of the asm_trace_hardirqs_on is already conditional on
CONFIG_TRACE_IRQFLAGS.  There's little point also making the use
of the macro conditional as well.  Get rid of these ifdefs to make
the code easier to read.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Apr 3, 2013
1 parent 07961ac commit 651e949
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions arch/arm/kernel/entry-common.S
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ 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
Expand Down Expand Up @@ -71,9 +69,8 @@ ENTRY(ret_to_user_from_irq)
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

Expand Down

0 comments on commit 651e949

Please sign in to comment.