aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorHyok S. Choi <hyok.choi@samsung.com>2006-04-24 09:45:35 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-04-24 09:45:35 +0100
commit3b920cef3470b7199acd2dc26e09fb9291131976 (patch)
tree8f1dbc433bd8b924420eb40504cbb8e81eafada4 /arch
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 (diff)
downloadlinux-dev-3b920cef3470b7199acd2dc26e09fb9291131976.tar.xz
linux-dev-3b920cef3470b7199acd2dc26e09fb9291131976.zip
[ARM] nommu: trivial fixups for head-nommu.S and the Makefile
This patch fix compilation problem of start-up codes. (head-nommu.S, arch/arm/kernel/Makefile) Signed-off-by: Hyok S. Choi <hyok.choi@samsung.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/kernel/Makefile2
-rw-r--r--arch/arm/kernel/head-nommu.S4
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index 2ce0e3a27a45..a601b8b55f35 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -29,7 +29,7 @@ ifneq ($(CONFIG_ARCH_EBSA110),y)
obj-y += io.o
endif
-head-y := head.o
+head-y := head$(MMUEXT).o
obj-$(CONFIG_DEBUG_LL) += debug.o
extra-y := $(head-y) init_task.o vmlinux.lds
diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S
index b093ab8738b5..0bea65864051 100644
--- a/arch/arm/kernel/head-nommu.S
+++ b/arch/arm/kernel/head-nommu.S
@@ -20,10 +20,11 @@
#include <asm/mach-types.h>
#include <asm/procinfo.h>
#include <asm/ptrace.h>
-#include <asm/constants.h>
+#include <asm/thread_info.h>
#include <asm/system.h>
#define PROCINFO_INITFUNC 12
+#define MACHINFO_TYPE 0
/*
* Kernel startup entry point.
@@ -79,5 +80,6 @@ __after_proc_init:
mov pc, r13 @ clear the BSS and jump
@ to start_kernel
+ .ltorg
#include "head-common.S"