arm64: Remove unused daif related functions/macros

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: Julien Thierry <julien.thierry@arm.com>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: James Morse <james.morse@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h
index 4feb6119c3c94840c459ceb3c328e67e60351688..7acf2436b5781253fd5894dcbdbac742eaade67d 100644 (file)
--- a/arch/arm64/include/asm/assembler.h
+++ b/arch/arm64/include/asm/assembler.h
@@ -62,16 +62,8 @@
        .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
        mrs     \flags, daif
        msr     daifset, #2

diff --git a/arch/arm64/include/asm/daifflags.h b/arch/arm64/include/asm/daifflags.h
index 8d91f2233135c0086509a92fec934dbef7acae89..546bc398553ead8745601da936339574689156b1 100644 (file)
--- a/arch/arm64/include/asm/daifflags.h
+++ b/arch/arm64/include/asm/daifflags.h
@@ -43,16 +43,6 @@ static inline unsigned long local_daif_save(void)
        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)
 {
        if (!arch_irqs_disabled_flags(flags))