arm64: force CONFIG_SMP=y and remove redundant #ifdefs

[cascardo/linux.git] / arch / arm64 / include / asm / assembler.h

diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h
index 144b64a..b51f2cc 100644 (file)
--- a/arch/arm64/include/asm/assembler.h
+++ b/arch/arm64/include/asm/assembler.h
@@ -49,18 +49,6 @@
        msr     daifclr, #2
        .endm
 
-/*
- * Save/disable and restore interrupts.
- */
-       .macro  save_and_disable_irqs, olddaif
-       mrs     \olddaif, daif
-       disable_irq
-       .endm
-
-       .macro  restore_irqs, olddaif
-       msr     daif, \olddaif
-       .endm
-
 /*
  * Enable and disable debug exceptions.
  */
@@ -103,9 +91,7 @@
  * SMP data memory barrier
  */
        .macro  smp_dmb, opt
-#ifdef CONFIG_SMP
        dmb     \opt
-#endif
        .endm
 
 #define USER(l, x...)                          \