aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-08-20 14:22:48 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-08-25 10:32:46 +0100
commit01e09a28167c338684606b70797422da3bbb6650 (patch)
tree654402bda132a415a7e862e2f60689e309c56e7a
parentb64d1f66517a89b9b0f6bd0bca86b05a55a5e742 (diff)
downloadlinux-linaro-stable-01e09a28167c338684606b70797422da3bbb6650.tar.gz
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>
-rw-r--r--arch/arm/include/asm/assembler.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index 4abe57279c66..742495eb5526 100644
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
@@ -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