diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-03-23 16:59:37 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-03-23 16:59:37 +0000 |
| commit | 9c42954dfd50d02963cd453fb84bfef3967af2f0 (patch) | |
| tree | 2b267af6c65b7fbc7cced81997108acafeb7bcd4 /arch/arm | |
| parent | 7d420896256a4bffe44202f282fbdd4c74d779a8 (diff) | |
| download | blackbird-op-linux-9c42954dfd50d02963cd453fb84bfef3967af2f0.tar.gz blackbird-op-linux-9c42954dfd50d02963cd453fb84bfef3967af2f0.zip | |
[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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/kernel/entry-header.S | 18 | ||||
| -rw-r--r-- | arch/arm/vfp/entry.S | 1 |
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 |
