Merge tag 'for-5.15/parisc' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

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

diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index b18288d..63bdb9e 100644 (file)
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -5,6 +5,7 @@
 
 #include <asm/thread_info.h>
 #include <asm/page.h>
+#include <asm/ftrace.lds.h>
 
 /*
  * Put .bss..swapper_pg_dir as the first thing in .bss. This will
@@ -46,6 +47,7 @@ SECTIONS
                KPROBES_TEXT
                IRQENTRY_TEXT
                SOFTIRQENTRY_TEXT
+               FTRACE_HOTPATCH_TRAMPOLINES_TEXT
                *(.text.*_indirect_*)
                *(.fixup)
                *(.gnu.warning)
@@ -72,10 +74,10 @@ SECTIONS
        BOOT_DATA_PRESERVED
 
        . = ALIGN(8);
-       .dma.refs : {
-               _start_dma_refs = .;
-               *(.dma.refs)
-               _end_dma_refs = .;
+       .amode31.refs : {
+               _start_amode31_refs = .;
+               *(.amode31.refs)
+               _end_amode31_refs = .;
        }
 
        _edata = .;             /* End of data section */
@@ -144,30 +146,30 @@ SECTIONS
        BOOT_DATA
 
        /*
-        * .dma section for code, data, ex_table that need to stay below 2 GB,
-        * even when the kernel is relocated above 2 GB.
+        * .amode31 section for code, data, ex_table that need to stay
+        * below 2 GB, even when the kernel is relocated above 2 GB.
         */
        . = ALIGN(PAGE_SIZE);
-       _sdma = .;
-       .dma.text : {
-               _stext_dma = .;
-               *(.dma.text)
-               *(.dma.text.*_indirect_*)
+       _samode31 = .;
+       .amode31.text : {
+               _stext_amode31 = .;
+               *(.amode31.text)
+               *(.amode31.text.*_indirect_*)
                . = ALIGN(PAGE_SIZE);
-               _etext_dma = .;
+               _etext_amode31 = .;
        }
        . = ALIGN(16);
-       .dma.ex_table : {
-               _start_dma_ex_table = .;
-               KEEP(*(.dma.ex_table))
-               _stop_dma_ex_table = .;
+       .amode31.ex_table : {
+               _start_amode31_ex_table = .;
+               KEEP(*(.amode31.ex_table))
+               _stop_amode31_ex_table = .;
        }
        . = ALIGN(PAGE_SIZE);
-       .dma.data : {
-               *(.dma.data)
+       .amode31.data : {
+               *(.amode31.data)
        }
        . = ALIGN(PAGE_SIZE);
-       _edma = .;
+       _eamode31 = .;
 
        /* early.c uses stsi, which requires page aligned data. */
        . = ALIGN(PAGE_SIZE);