Commit bce495d8 authored by Russell King's avatar Russell King
Browse files

[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: default avatarRussell King <rmk@arm.linux.org.uk>
parent f4dc9a4c

arch/arm/kernel/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -31,8 +31,3 @@ head-y := head.o 
obj-$(CONFIG_DEBUG_LL)	+= debug.o



extra-y := $(head-y) init_task.o vmlinux.lds
 


# Spell out some dependencies that aren't automatically figured out

$(obj)/entry-armv.o: 	$(obj)/entry-header.S include/asm-arm/constants.h

$(obj)/entry-common.o: 	$(obj)/entry-header.S include/asm-arm/constants.h \

			$(obj)/calls.S

arch/arm/kernel/entry-armv.S

+3 −3
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ 
 *  it to save wrong values...  Be aware!

 */

#include <linux/config.h>

#include <linux/init.h>



#include <asm/thread_info.h>

#include <asm/glue.h>

#include <asm/ptrace.h>

#include <asm/vfpmacros.h>

#include <asm/hardware.h>		@ should be moved into entry-macro.S

#include <asm/arch/irqs.h>		@ should be moved into entry-macro.S

#include <asm/arch/entry-macro.S>



#include "entry-header.S"

arch/arm/kernel/entry-common.S

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ 
 */

#include <linux/config.h>



#include <asm/thread_info.h>

#include <asm/ptrace.h>

#include <asm/unistd.h>



#include "entry-header.S"

arch/arm/kernel/entry-header.S

+9 −12
Original line number Diff line number Diff line 
#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