Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge

1 files changed, 4 insertions, 25 deletions

diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index d4dfcfbce272..7fa7b15fd8e6 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -3,9 +3,12 @@
 #include <asm/page.h>
 #else
 #define PAGE_SIZE       4096
+#define KERNELBASE      CONFIG_KERNEL_START
 #endif
 #include <asm-generic/vmlinux.lds.h>
 
+ENTRY(_stext)
+
 #ifdef CONFIG_PPC64
 OUTPUT_ARCH(powerpc:common64)
 jiffies = jiffies_64;
@@ -21,33 +24,9 @@ SECTIONS
     *(.exit.data)
   }
 
+  . = KERNELBASE;
 
   /* Read-only sections, merged into text segment: */
-#ifdef CONFIG_PPC32
-  . = + SIZEOF_HEADERS;
-  .interp : { *(.interp) }
-  .hash          : { *(.hash)           }
-  .dynsym        : { *(.dynsym)         }
-  .dynstr        : { *(.dynstr)         }
-  .rel.text      : { *(.rel.text)               }
-  .rela.text     : { *(.rela.text)      }
-  .rel.data      : { *(.rel.data)               }
-  .rela.data     : { *(.rela.data)      }
-  .rel.rodata    : { *(.rel.rodata)     }
-  .rela.rodata   : { *(.rela.rodata)    }
-  .rel.got       : { *(.rel.got)                }
-  .rela.got      : { *(.rela.got)               }
-  .rel.ctors     : { *(.rel.ctors)      }
-  .rela.ctors    : { *(.rela.ctors)     }
-  .rel.dtors     : { *(.rel.dtors)      }
-  .rela.dtors    : { *(.rela.dtors)     }
-  .rel.bss       : { *(.rel.bss)                }
-  .rela.bss      : { *(.rela.bss)               }
-  .rel.plt       : { *(.rel.plt)                }
-  .rela.plt      : { *(.rela.plt)               }
-/*  .init          : { *(.init) } =0*/
-  .plt : { *(.plt) }
-#endif
   .text : {
     *(.text .text.*)
     SCHED_TEXT