Merge flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5

into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-rmk

arch/arm/Makefile

@@ -8,6 +8,7 @@
 # Copyright (C) 1995-2001 by Russell King
 
 LDFLAGS_vmlinux	:=-p -X
+LDFLAGS_BLOB	:=--format binary
 AFLAGS_vmlinux.lds.o = -DTEXTADDR=$(TEXTADDR) -DDATAADDR=$(DATAADDR)
 OBJCOPYFLAGS	:=-O binary -R .note -R .comment -S
 GZFLAGS		:=-9
@@ -60,6 +61,7 @@ AFLAGS		+=$(apcs-y) $(arch-y) -mno-fpu -msoft-float -Wa,-mno-fpu
 ifeq ($(CONFIG_CPU_26),y)
 PROCESSOR	:= armo
 HEAD		:= arch/arm/mach-arc/head.o arch/arm/kernel/init_task.o
+LDFLAGS_BLOB	+= --oformat elf26-littlearm
   ifeq ($(CONFIG_ROM_KERNEL),y)
     DATAADDR	 = 0x02080000
     TEXTADDR	 = 0x03800000
@@ -72,6 +74,7 @@ ifeq ($(CONFIG_CPU_32),y)
 PROCESSOR	 = armv
 HEAD		:= arch/arm/kernel/head.o arch/arm/kernel/init_task.o
 TEXTADDR	 = 0xC0008000
+LDFLAGS_BLOB	+= --oformat elf32-littlearm
 endif
 
 ifeq ($(CONFIG_ARCH_ARCA5K),y)

arch/arm/kernel/process.c

@@ -391,12 +391,12 @@ void dump_thread(struct pt_regs * regs, struct user * dump)
  */
 pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
 {
-	pid_t __ret;
+	register unsigned int r0 asm("r0") = flags | CLONE_VM | CLONE_UNTRACED;
+	register unsigned int r1 asm("r1") = 0;
+	register pid_t __ret asm("r0");
 
 	__asm__ __volatile__(
-	"orr	r0, %1, %2	@ kernel_thread sys_clone	\n\
-	mov	r1, #0						\n\
-	"__syscall(clone)"					\n\
+	__syscall(clone)"	@ kernel_thread sys_clone	\n\
 	movs	%0, r0		@ if we are the child		\n\
 	bne	1f						\n\
 	mov	fp, #0		@ ensure that fp is zero	\n\
@@ -406,8 +406,8 @@ pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
 	b	sys_exit					\n\
 1:	"
         : "=r" (__ret)
-        : "Ir" (flags), "r" (CLONE_VM | CLONE_UNTRACED), "r" (fn), "r" (arg)
-	: "r0", "r1", "lr");
+        : "0" (r0), "r" (r1), "r" (fn), "r" (arg)
+	: "lr");
 	return __ret;
 }
 

arch/arm/vmlinux-armv.lds.in

@@ -37,7 +37,7 @@ SECTIONS
 		__initcall_end = .;
 		. = ALIGN(32);
 		__initramfs_start = .;
-			*(.init.initramfs)
+			usr/built-in.o(.init.ramfs)
 		__initramfs_end = .;
 		. = ALIGN(4096);
 		__init_end = .;

drivers/acorn/scsi/arxescsi.c

@@ -35,6 +35,7 @@
 #include <asm/irq.h>
 #include <asm/ecard.h>
 
+#include "../../scsi/scsi.h"
 #include "../../scsi/hosts.h"
 #include "arxescsi.h"
 #include "fas216.h"

drivers/acorn/scsi/cumana_2.c

@@ -35,6 +35,7 @@
 #include <asm/irq.h>
 #include <asm/pgtable.h>
 
+#include "../../scsi/scsi.h"
 #include "../../scsi/hosts.h"
 #include "fas216.h"
 #include "scsi.h"

drivers/acorn/scsi/eesox.c

@@ -41,6 +41,7 @@
 #include <asm/ecard.h>
 #include <asm/pgtable.h>
 
+#include "../../scsi/scsi.h"
 #include "../../scsi/hosts.h"
 #include "fas216.h"
 #include "scsi.h"

drivers/acorn/scsi/powertec.c

@@ -38,6 +38,7 @@
 #include <asm/irq.h>
 #include <asm/pgtable.h>
 
+#include "../../scsi/scsi.h"
 #include "../../scsi/hosts.h"
 #include "fas216.h"
 #include "scsi.h"