hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Russell King 2015-08-20 14:22:48 +01:00
parent b64d1f6651
commit 01e09a2816
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/include/asm/assembler.h
View File

@ -116,7 +116,7 @@
#endif #endif
.endm .endm
.macro asm_trace_hardirqs_on_cond, cond .macro asm_trace_hardirqs_on, cond=al
#if defined(CONFIG_TRACE_IRQFLAGS) #if defined(CONFIG_TRACE_IRQFLAGS)
/* /*
* actually the registers should be pushed and pop'd conditionally, but * actually the registers should be pushed and pop'd conditionally, but
@ -128,10 +128,6 @@
#endif #endif
.endm .endm
.macro asm_trace_hardirqs_on
asm_trace_hardirqs_on_cond al
.endm
.macro disable_irq .macro disable_irq
disable_irq_notrace disable_irq_notrace
asm_trace_hardirqs_off asm_trace_hardirqs_off
@ -173,7 +169,7 @@
.macro restore_irqs, oldcpsr .macro restore_irqs, oldcpsr
tst \oldcpsr, #PSR_I_BIT tst \oldcpsr, #PSR_I_BIT
asm_trace_hardirqs_on_cond eq asm_trace_hardirqs_on cond=eq
restore_irqs_notrace \oldcpsr restore_irqs_notrace \oldcpsr
.endm .endm