Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 651e9499 authored by Russell King's avatar Russell King
Browse files

ARM: entry-common: get rid of unnecessary ifdefs 



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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 07961ac7

arch/arm/kernel/entry-common.S

+1 −4
Original line number Diff line number Diff line
@@ -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
@@ -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