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: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
b64d1f6651
commit
01e09a2816
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue