[PATCH] Sun3: General updates

General compile fixes for 2.6.16 for sun3, and some updates to make the new
bootloader work correctly.  Tested on 3/50, 3/60, 3/80.

Signed-off-by: Sam Creasey <sammy@sammy.net>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 1 insertions, 11 deletions

diff --git a/arch/m68k/kernel/sun3-head.S b/arch/m68k/kernel/sun3-head.S
index bffd69a4a1ab..4b5f050204e8 100644
--- a/arch/m68k/kernel/sun3-head.S
+++ b/arch/m68k/kernel/sun3-head.S
@@ -67,16 +67,6 @@ ENTRY(_start)
 1:      lea     init_task,%curptr                       | get initial thread...
         lea     init_thread_union+THREAD_SIZE,%sp       | ...and its stack.
 
-/* copy bootinfo records from the loader to _end */
-        lea     _end, %a1
-        lea     BI_START, %a0
-        /* number of longs to copy */
-        movel   %a0@, %d0
-1:      addl    #4, %a0
-        movel   %a0@, %a1@
-        addl    #4, %a1
-        dbf     %d0, 1b
-
 /* Point MSP at an invalid page to trap if it's used. --m */
         movl    #(PAGESIZE),%d0
         movc    %d0,%msp
diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds
index 2550b4ae2732..8c7eccbfc982 100644
--- a/arch/m68k/kernel/vmlinux-sun3.lds
+++ b/arch/m68k/kernel/vmlinux-sun3.lds
@@ -8,7 +8,7 @@ ENTRY(_start)
 jiffies = jiffies_64 + 4;
 SECTIONS
 {
-  . = 0xE004000;
+  . = 0xE002000;
   _text = .;                    /* Text and read-only data */
   .text : {
         *(.head)