commit f13d241bc300802a2576dc3e2dfb51492a9a88b4
author Russell King <rmk@dyn-67.arm.linux.org.uk> Wed Apr 26 21:18:45 2006 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Wed Apr 26 21:18:45 2006 +0100
tree ddb0e3d218fcb3f9e421c4f36d4a16e90ab20597
parent 928bd1b4709045355fad8bf858904884c0a1e87f
parent 3b920cef3470b7199acd2dc26e09fb9291131976

Merge nommu tree

arch/arm/kernel/Makefile

diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index 2ce0e3a..a601b8b 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -29,7 +29,7 @@
   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

arch/arm/kernel/head-nommu.S

diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S
index b093ab8..0bea658 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 @@
 
 	mov	pc, r13				@ clear the BSS and jump
 						@ to start_kernel
+	.ltorg
 
 #include "head-common.S"