diff options
Diffstat (limited to 'arch/arm/include/asm/assembler.h')
-rw-r--r-- | arch/arm/include/asm/assembler.h | 8 |
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 @@ | |||
116 | #endif | 116 | #endif |
117 | .endm | 117 | .endm |
118 | 118 | ||
119 | .macro asm_trace_hardirqs_on_cond, cond | 119 | .macro asm_trace_hardirqs_on, cond=al |
120 | #if defined(CONFIG_TRACE_IRQFLAGS) | 120 | #if defined(CONFIG_TRACE_IRQFLAGS) |
121 | /* | 121 | /* |
122 | * actually the registers should be pushed and pop'd conditionally, but | 122 | * actually the registers should be pushed and pop'd conditionally, but |
@@ -128,10 +128,6 @@ | |||
128 | #endif | 128 | #endif |
129 | .endm | 129 | .endm |
130 | 130 | ||
131 | .macro asm_trace_hardirqs_on | ||
132 | asm_trace_hardirqs_on_cond al | ||
133 | .endm | ||
134 | |||
135 | .macro disable_irq | 131 | .macro disable_irq |
136 | disable_irq_notrace | 132 | disable_irq_notrace |
137 | asm_trace_hardirqs_off | 133 | asm_trace_hardirqs_off |
@@ -173,7 +169,7 @@ | |||
173 | 169 | ||
174 | .macro restore_irqs, oldcpsr | 170 | .macro restore_irqs, oldcpsr |
175 | tst \oldcpsr, #PSR_I_BIT | 171 | tst \oldcpsr, #PSR_I_BIT |
176 | asm_trace_hardirqs_on_cond eq | 172 | asm_trace_hardirqs_on cond=eq |
177 | restore_irqs_notrace \oldcpsr | 173 | restore_irqs_notrace \oldcpsr |
178 | .endm | 174 | .endm |
179 | 175 | ||