提交 d458d876 编写于 作者: J Julien Thierry 提交者: Caspar Zhang

arm64: Remove unused daif related functions/macros

task #25552995

commit a82785a953e03444fe38616aed4d27b01da79a97 upstream

There are some helpers to modify PSR.[DAIF] bits that are not referenced
anywhere. The less these bits are available outside of local_irq_*
functions the better.

Get rid of those unused helpers.
Signed-off-by: NJulien Thierry <julien.thierry@arm.com>
Reviewed-by: NMark Rutland <mark.rutland@arm.com>
Acked-by: NCatalin Marinas <catalin.marinas@arm.com>
Acked-by: NMarc Zyngier <marc.zyngier@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: James Morse <james.morse@arm.com>
Signed-off-by: NCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: NZou Cao <zoucao@linux.alibaba.com>
Reviewed-by: Nluanshi <zhangliguang@linux.alibaba.com>
上级 d0cd7461
...@@ -60,16 +60,8 @@ ...@@ -60,16 +60,8 @@
.endm .endm
/* /*
* Enable and disable interrupts. * Save/restore interrupts.
*/ */
.macro disable_irq
msr daifset, #2
.endm
.macro enable_irq
msr daifclr, #2
.endm
.macro save_and_disable_irq, flags .macro save_and_disable_irq, flags
mrs \flags, daif mrs \flags, daif
msr daifset, #2 msr daifset, #2
......
...@@ -44,16 +44,6 @@ static inline unsigned long local_daif_save(void) ...@@ -44,16 +44,6 @@ static inline unsigned long local_daif_save(void)
return flags; return flags;
} }
static inline void local_daif_unmask(void)
{
trace_hardirqs_on();
asm volatile(
"msr daifclr, #0xf // local_daif_unmask"
:
:
: "memory");
}
static inline void local_daif_restore(unsigned long flags) static inline void local_daif_restore(unsigned long flags)
{ {
if (!arch_irqs_disabled_flags(flags)) if (!arch_irqs_disabled_flags(flags))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册