Merge tag 'powerpc-4.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[sfrench/cifs-2.6.git] / arch / powerpc / kernel / vmlinux.lds.S

diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 105a976323aaa9dd5637c522ceedf4b1a0e994eb..434581bcd5b420df3108feb7861eb09ce31914ea 100644 (file)
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -4,6 +4,9 @@
 #else
 #define PROVIDE32(x)   PROVIDE(x)
 #endif
+
+#define BSS_FIRST_SECTIONS *(.bss.prominit)
+
 #include <asm/page.h>
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/cache.h>
@@ -99,6 +102,9 @@ SECTIONS
 #endif
                /* careful! __ftr_alt_* sections need to be close to .text */
                *(.text.hot TEXT_MAIN .text.fixup .text.unlikely .fixup __ftr_alt_* .ref.text);
+#ifdef CONFIG_PPC64
+               *(.tramp.ftrace.text);
+#endif
                SCHED_TEXT
                CPUIDLE_TEXT
                LOCK_TEXT
@@ -181,7 +187,15 @@ SECTIONS
  */
        . = ALIGN(STRICT_ALIGN_SIZE);
        __init_begin = .;
-       INIT_TEXT_SECTION(PAGE_SIZE) :kernel
+       . = ALIGN(PAGE_SIZE);
+       .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) {
+               _sinittext = .;
+               INIT_TEXT
+               _einittext = .;
+#ifdef CONFIG_PPC64
+               *(.tramp.ftrace.init);
+#endif
+       } :kernel
 
        /* .exit.text is discarded at runtime, not link time,
         * to deal with references from __bug_table