summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/entry-header.S
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-04-26 15:21:02 +0100
committerRussell King <rmk@dyn-67.arm.linux.org.uk>2005-04-26 15:21:02 +0100
commitbce495d865829d7a1d8102a834d3e3af32616567 (patch)
tree7adb68ca1e724bace46271258b2500aa2869ddc9 /arch/arm/kernel/entry-header.S
parentf4dc9a4cf26278f5b608d6e4bd16e7b27ddcf1a5 (diff)
downloadlinux-bce495d865829d7a1d8102a834d3e3af32616567.tar.bz2
[PATCH] ARM: make entry*.S includes more logical
Move common includes to entry-header, and file specific includes to the relevant file. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/entry-header.S')
-rw-r--r--arch/arm/kernel/entry-header.S21
1 files changed, 9 insertions, 12 deletions
diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
index 956af0bff3ff..a3d40a0e2b04 100644
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@ -1,20 +1,11 @@
-#include <linux/config.h> /* for CONFIG_ARCH_xxxx */
+#include <linux/config.h>
+#include <linux/init.h>
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <asm/constants.h>
#include <asm/errno.h>
-#include <asm/hardware.h>
-#include <asm/arch/irqs.h>
-#include <asm/arch/entry-macro.S>
-
- .macro zero_fp
-#ifdef CONFIG_FRAME_POINTER
- mov fp, #0
-#endif
- .endm
-
- .text
+#include <asm/thread_info.h>
@ Bad Abort numbers
@ -----------------
@@ -39,6 +30,12 @@
#error "Please fix"
#endif
+ .macro zero_fp
+#ifdef CONFIG_FRAME_POINTER
+ mov fp, #0
+#endif
+ .endm
+
#if __LINUX_ARM_ARCH__ >= 6
.macro disable_irq
cpsid i