[ARM] Move enable_irq and disable_irq to assembler.h

5d25ac038a317d454a4321cba955f756400835a5 broke VFP builds due to
enable_irq not being defined as an assembly macro.  Move it to
assembler.h so everyone can use it.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

2 files changed, 1 insertions, 18 deletions

diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
index 55c99cdab7d6..f1c2fd5b63e4 100644
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@ -37,24 +37,6 @@
 #endif
         .endm
 
-#if __LINUX_ARM_ARCH__ >= 6
-        .macro  disable_irq
-        cpsid   i
-        .endm
-
-        .macro  enable_irq
-        cpsie   i
-        .endm
-#else
-        .macro  disable_irq
-        msr     cpsr_c, #PSR_I_BIT | SVC_MODE
-        .endm
-
-        .macro  enable_irq
-        msr     cpsr_c, #SVC_MODE
-        .endm
-#endif
-
         .macro  get_thread_info, rd
         mov     \rd, sp, lsr #13
         mov     \rd, \rd, lsl #13
diff --git a/arch/arm/vfp/entry.S b/arch/arm/vfp/entry.S
index 9ab1abfbe7ad..7b595547c1c8 100644
--- a/arch/arm/vfp/entry.S
+++ b/arch/arm/vfp/entry.S
@@ -18,6 +18,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/asm-offsets.h>
+#include <asm/assembler.h>
 #include <asm/vfpmacros.h>
 
         .globl  do_vfp