Merge tag 'mmc-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

[cascardo/linux.git] / arch / parisc / kernel / vmlinux.lds.S

diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S
index 5b8fae8..3d6ef1b 100644 (file)
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
@@ -69,6 +69,7 @@ SECTIONS
        .text ALIGN(PAGE_SIZE) : {
                TEXT_TEXT
                SCHED_TEXT
+               CPUIDLE_TEXT
                LOCK_TEXT
                KPROBES_TEXT
                IRQENTRY_TEXT
@@ -89,8 +90,9 @@ SECTIONS
        /* Start of data section */
        _sdata = .;
 
-       RO_DATA_SECTION(8)
-
+       /* Architecturally we need to keep __gp below 0x1000000 and thus
+        * in front of RO_DATA_SECTION() which stores lots of tracepoint
+        * and ftrace symbols. */
 #ifdef CONFIG_64BIT
        . = ALIGN(16);
        /* Linkage tables */
@@ -105,6 +107,12 @@ SECTIONS
        }
 #endif
 
+       RO_DATA_SECTION(8)
+
+       /* RO because of BUILDTIME_EXTABLE_SORT */
+       EXCEPTION_TABLE(8)
+       NOTES
+
        /* unwind info */
        .PARISC.unwind : {
                __start___unwind = .;
@@ -120,9 +128,6 @@ SECTIONS
        . = ALIGN(HUGEPAGE_SIZE);
        data_start = .;
 
-       EXCEPTION_TABLE(8)
-       NOTES
-
        /* Data */
        RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, PAGE_SIZE)