aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-04-26 21:18:45 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-04-26 21:18:45 +0100
commitf13d241bc300802a2576dc3e2dfb51492a9a88b4 (patch)
treeddb0e3d218fcb3f9e421c4f36d4a16e90ab20597 /arch/arm
parent928bd1b4709045355fad8bf858904884c0a1e87f (diff)
parent3b920cef3470b7199acd2dc26e09fb9291131976 (diff)
Merge nommu tree
Diffstat (limited to 'arch/arm')
-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 2ce0e3a27a4..a601b8b55f3 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 b093ab8738b..0bea6586405 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"