fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / m68k / kernel / vmlinux-sun3.lds

diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds
index cc37e8d..8c7eccb 100644 (file)
--- a/arch/m68k/kernel/vmlinux-sun3.lds
+++ b/arch/m68k/kernel/vmlinux-sun3.lds
@@ -8,12 +8,13 @@ ENTRY(_start)
 jiffies = jiffies_64 + 4;
 SECTIONS
 {
-  . = 0xE004000;
+  . = 0xE002000;
   _text = .;                   /* Text and read-only data */
   .text : {
        *(.head)
        *(.text)
        SCHED_TEXT
+       LOCK_TEXT
        *(.fixup)
        *(.gnu.warning)
        } :text = 0x4e75
@@ -47,13 +48,7 @@ __init_begin = .;
        __setup_end = .;
        __initcall_start = .;
        .initcall.init : {
-               *(.initcall1.init)
-               *(.initcall2.init)
-               *(.initcall3.init)
-               *(.initcall4.init)
-               *(.initcall5.init)
-               *(.initcall6.init)
-               *(.initcall7.init)
+               INITCALLS
        }
        __initcall_end = .;
        __con_initcall_start = .;
@@ -66,7 +61,7 @@ __init_begin = .;
        __initramfs_end = .;
        . = ALIGN(8192);
        __init_end = .;
-       .init.task : { *(init_task) }
+       .data.init.task : { *(.data.init_task) }
 
 
   .bss : { *(.bss) }           /* BSS */