vserver 1.9.5.x5

[linux-2.6.git] / arch / mips / kernel / vmlinux.lds.S

diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index e70684e..e830d78 100644 (file)
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -49,7 +49,7 @@ SECTIONS
 
   /* writeable */
   .data : {                    /* Data */
-    . = . + MAPPED_OFFSET;     /* for CONFIG_MAPPED_KERNEL */
+    . = . + DATAOFFSET;                /* for CONFIG_MAPPED_KERNEL */
     *(.data.init_task)
 
     *(.data)
@@ -85,8 +85,6 @@ SECTIONS
   /* will be freed after init */
   . = ALIGN(4096);             /* Init code and data */
   __init_begin = .;
-  /* /DISCARD/ doesn't work for .reginfo */
-  .reginfo : { *(.reginfo) }
   .init.text : {
        _sinittext = .;
        *(.init.text)
@@ -150,6 +148,15 @@ SECTIONS
         *(.exit.text)
         *(.exit.data)
         *(.exitcall.exit)
+
+       /* ABI crap starts here */
+       *(.comment)
+       *(.MIPS.options)
+       *(.note)
+       *(.options)
+       *(.pdr)
+       *(.reginfo)
+       *(.mdebug*)
   }
 
   /* This is the MIPS specific mdebug section.  */