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

Commit 01e09a28 authored by Russell King's avatar Russell King
Browse files

ARM: entry: get rid of asm_trace_hardirqs_on_cond 



There's no need for this macro, it can use a default for the
condition argument.

Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent b64d1f66

arch/arm/include/asm/assembler.h

+2 −6
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ 
#endif

	.endm



	.macro asm_trace_hardirqs_on_cond, cond

	.macro asm_trace_hardirqs_on, cond=al

#if defined(CONFIG_TRACE_IRQFLAGS)

	/*

	 * actually the registers should be pushed and pop'd conditionally, but
@@ -128,10 +128,6 @@ 
#endif

	.endm



	.macro asm_trace_hardirqs_on

	asm_trace_hardirqs_on_cond al

	.endm



	.macro disable_irq

	disable_irq_notrace

	asm_trace_hardirqs_off
@@ -173,7 +169,7 @@ 


	.macro restore_irqs, oldcpsr

	tst	\oldcpsr, #PSR_I_BIT

	asm_trace_hardirqs_on_cond eq

	asm_trace_hardirqs_on cond=eq

	restore_irqs_notrace \oldcpsr

	.endm