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 f293e56..8c7eccb 100644 (file)
--- a/arch/m68k/kernel/vmlinux-sun3.lds
+++ b/arch/m68k/kernel/vmlinux-sun3.lds
@@ -8,15 +8,16 @@ 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)
-       } = 0x4e75
+       } :text = 0x4e75
        RODATA
 
   _etext = .;                  /* End of text section */
@@ -24,39 +25,30 @@ SECTIONS
   .data : {                    /* Data */
        *(.data)
        CONSTRUCTORS
-       . = ALIGN(16);          /* Exception table */
-       __start___ex_table = .;
-       *(__ex_table) 
-       __stop___ex_table = .;
-       }
+       . = ALIGN(16);          /* Exception table */
+       __start___ex_table = .;
+       *(__ex_table)
+       __stop___ex_table = .;
+       } :data
   /* End of data goes *here* so that freeing init code works properly. */
   _edata = .;
 
   /* will be freed after init */
   . = ALIGN(8192);     /* Init code and data */
 __init_begin = .;
-       .init.text : { 
+       .init.text : {
                _sinittext = .;
                *(.init.text)
                _einittext = .;
        }
-       .init.data : { *(.init.data) }
+       .init.data : { *(.init.data) }
        . = ALIGN(16);
        __setup_start = .;
        .init.setup : { *(.init.setup) }
        __setup_end = .;
-       __start___param = .;
-       __param : { *(__param) }
-       __stop___param = .;
        __initcall_start = .;
        .initcall.init : {
-               *(.initcall1.init) 
-               *(.initcall2.init) 
-               *(.initcall3.init) 
-               *(.initcall4.init) 
-               *(.initcall5.init) 
-               *(.initcall6.init) 
-               *(.initcall7.init)
+               INITCALLS
        }
        __initcall_end = .;
        __con_initcall_start = .;
@@ -69,8 +61,8 @@ __init_begin = .;
        __initramfs_end = .;
        . = ALIGN(8192);
        __init_end = .;
-       .init.task : { *(init_task) }
-       
+       .data.init.task : { *(.data.init_task) }
+
 
   .bss : { *(.bss) }           /* BSS */
 
@@ -84,7 +76,7 @@ __init_begin = .;
        }
 
   .crap : {
-       /* Stabs debugging sections.  */
+       /* Stabs debugging sections.  */
        *(.stab)
        *(.stabstr)
        *(.stab.excl)