18 files changed, 97 insertions, 70 deletions

diff --git a/arch/powerpc/kernel/align.c b/arch/powerpc/kernel/align.c
index a5b632e52fae..3839839f83c7 100644
--- a/arch/powerpc/kernel/align.c
+++ b/arch/powerpc/kernel/align.c
@@ -732,7 +732,7 @@ int fix_alignment(struct pt_regs *regs)
 
 #ifdef CONFIG_SPE
         if ((instr >> 26) == 0x4) {
-                PPC_WARN_EMULATED(spe);
+                PPC_WARN_ALIGNMENT(spe, regs);
                 return emulate_spe(regs, reg, instr);
         }
 #endif
@@ -786,7 +786,7 @@ int fix_alignment(struct pt_regs *regs)
                         flags |= SPLT;
                         nb = 8;
                 }
-                PPC_WARN_EMULATED(vsx);
+                PPC_WARN_ALIGNMENT(vsx, regs);
                 return emulate_vsx(addr, reg, areg, regs, flags, nb);
         }
 #endif
@@ -794,7 +794,7 @@ int fix_alignment(struct pt_regs *regs)
          * the exception of DCBZ which is handled as a special case here
          */
         if (instr == DCBZ) {
-                PPC_WARN_EMULATED(dcbz);
+                PPC_WARN_ALIGNMENT(dcbz, regs);
                 return emulate_dcbz(regs, addr);
         }
         if (unlikely(nb == 0))
@@ -804,7 +804,7 @@ int fix_alignment(struct pt_regs *regs)
          * function
          */
         if (flags & M) {
-                PPC_WARN_EMULATED(multiple);
+                PPC_WARN_ALIGNMENT(multiple, regs);
                 return emulate_multiple(regs, addr, reg, nb,
                                         flags, instr, swiz);
         }
@@ -825,11 +825,11 @@ int fix_alignment(struct pt_regs *regs)
 
         /* Special case for 16-byte FP loads and stores */
         if (nb == 16) {
-                PPC_WARN_EMULATED(fp_pair);
+                PPC_WARN_ALIGNMENT(fp_pair, regs);
                 return emulate_fp_pair(addr, reg, flags);
         }
 
-        PPC_WARN_EMULATED(unaligned);
+        PPC_WARN_ALIGNMENT(unaligned, regs);
 
         /* If we are loading, get the data from user space, else
          * get it from register values
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index f9fd54bfcc84..bdcb557d470a 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -551,7 +551,7 @@ restore:
 BEGIN_FW_FTR_SECTION
         ld      r5,SOFTE(r1)
 FW_FTR_SECTION_ELSE
-        b       iseries_check_pending_irqs
+        b       .Liseries_check_pending_irqs
 ALT_FW_FTR_SECTION_END_IFCLR(FW_FEATURE_ISERIES)
 2:
         TRACE_AND_RESTORE_IRQ(r5);
@@ -623,7 +623,7 @@ ALT_FW_FTR_SECTION_END_IFCLR(FW_FEATURE_ISERIES)
 
 #endif /* CONFIG_PPC_BOOK3E */
 
-iseries_check_pending_irqs:
+.Liseries_check_pending_irqs:
 #ifdef CONFIG_PPC_ISERIES
         ld      r5,SOFTE(r1)
         cmpdi   0,r5,0
@@ -658,42 +658,43 @@ do_work:
         cmpdi   r0,0
         crandc  eq,cr1*4+eq,eq
         bne     restore
-        /* here we are preempting the current task */
-1:
-#ifdef CONFIG_TRACE_IRQFLAGS
-        bl      .trace_hardirqs_on
-        /* Note: we just clobbered r10 which used to contain the previous
-         * MSR before the hard-disabling done by the caller of do_work.
-         * We don't have that value anymore, but it doesn't matter as
-         * we will hard-enable unconditionally, we can just reload the
-         * current MSR into r10
+
+        /* Here we are preempting the current task.
+         *
+         * Ensure interrupts are soft-disabled. We also properly mark
+         * the PACA to reflect the fact that they are hard-disabled
+         * and trace the change
          */
-        mfmsr   r10
-#endif /* CONFIG_TRACE_IRQFLAGS */
-        li      r0,1
+        li      r0,0
         stb     r0,PACASOFTIRQEN(r13)
         stb     r0,PACAHARDIRQEN(r13)
+        TRACE_DISABLE_INTS
+
+        /* Call the scheduler with soft IRQs off */
+1:      bl      .preempt_schedule_irq
+
+        /* Hard-disable interrupts again (and update PACA) */
 #ifdef CONFIG_PPC_BOOK3E
-        wrteei  1
-        bl      .preempt_schedule
         wrteei  0
 #else
-        ori     r10,r10,MSR_EE
-        mtmsrd  r10,1           /* reenable interrupts */
-        bl      .preempt_schedule
         mfmsr   r10
-        clrrdi  r9,r1,THREAD_SHIFT
-        rldicl  r10,r10,48,1    /* disable interrupts again */
+        rldicl  r10,r10,48,1
         rotldi  r10,r10,16
         mtmsrd  r10,1
 #endif /* CONFIG_PPC_BOOK3E */
+        li      r0,0
+        stb     r0,PACAHARDIRQEN(r13)
+
+        /* Re-test flags and eventually loop */
+        clrrdi  r9,r1,THREAD_SHIFT
         ld      r4,TI_FLAGS(r9)
         andi.   r0,r4,_TIF_NEED_RESCHED
         bne     1b
         b       restore
 
 user_work:
-#endif
+#endif /* CONFIG_PREEMPT */
+
         /* Enable interrupts */
 #ifdef CONFIG_PPC_BOOK3E
         wrteei  1
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 1808876edcc9..c7eb4e0eb86c 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -185,12 +185,15 @@ END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE)
          * prolog code of the PerformanceMonitor one. A little
          * trickery is thus necessary
          */
+performance_monitor_pSeries_1:
         . = 0xf00
         b       performance_monitor_pSeries
 
+altivec_unavailable_pSeries_1:
         . = 0xf20
         b       altivec_unavailable_pSeries
 
+vsx_unavailable_pSeries_1:
         . = 0xf40
         b       vsx_unavailable_pSeries
 
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index e5d121177984..02a334662cc0 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -70,6 +70,8 @@
 #include <asm/firmware.h>
 #include <asm/lv1call.h>
 #endif
+#define CREATE_TRACE_POINTS
+#include <asm/trace.h>
 
 int __irq_offset_value;
 static int ppc_spurious_interrupts;
@@ -325,6 +327,8 @@ void do_IRQ(struct pt_regs *regs)
         struct pt_regs *old_regs = set_irq_regs(regs);
         unsigned int irq;
 
+        trace_irq_entry(regs);
+
         irq_enter();
 
         check_stack_overflow();
@@ -348,6 +352,8 @@ void do_IRQ(struct pt_regs *regs)
                 timer_interrupt(regs);
         }
 #endif
+
+        trace_irq_exit(regs);
 }
 
 void __init init_IRQ(void)
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index ba949a2c93ac..ccf56ac92de5 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -97,7 +97,9 @@ int pcibios_unmap_io_space(struct pci_bus *bus)
          * to do an appropriate TLB flush here too
          */
         if (bus->self) {
+#ifdef CONFIG_PPC_STD_MMU_64
                 struct resource *res = bus->resource[0];
+#endif
 
                 pr_debug("IO unmapping for PCI-PCI bridge %s\n",
                          pci_name(bus->self));
diff --git a/arch/powerpc/kernel/perf_event.c b/arch/powerpc/kernel/perf_event.c
index bbcbae183e92..1eb85fbf53a5 100644
--- a/arch/powerpc/kernel/perf_event.c
+++ b/arch/powerpc/kernel/perf_event.c
@@ -116,20 +116,23 @@ static inline void perf_get_data_addr(struct pt_regs *regs, u64 *addrp)
 static inline u32 perf_get_misc_flags(struct pt_regs *regs)
 {
         unsigned long mmcra = regs->dsisr;
+        unsigned long sihv = MMCRA_SIHV;
+        unsigned long sipr = MMCRA_SIPR;
 
         if (TRAP(regs) != 0xf00)
                 return 0;       /* not a PMU interrupt */
 
         if (ppmu->flags & PPMU_ALT_SIPR) {
-                if (mmcra & POWER6_MMCRA_SIHV)
-                        return PERF_RECORD_MISC_HYPERVISOR;
-                return (mmcra & POWER6_MMCRA_SIPR) ?
-                        PERF_RECORD_MISC_USER : PERF_RECORD_MISC_KERNEL;
+                sihv = POWER6_MMCRA_SIHV;
+                sipr = POWER6_MMCRA_SIPR;
         }
-        if (mmcra & MMCRA_SIHV)
+
+        /* PR has priority over HV, so order below is important */
+        if (mmcra & sipr)
+                return PERF_RECORD_MISC_USER;
+        if ((mmcra & sihv) && (freeze_events_kernel != MMCR0_FCHV))
                 return PERF_RECORD_MISC_HYPERVISOR;
-        return (mmcra & MMCRA_SIPR) ? PERF_RECORD_MISC_USER :
-                PERF_RECORD_MISC_KERNEL;
+        return PERF_RECORD_MISC_KERNEL;
 }
 
 /*
@@ -1162,7 +1165,7 @@ static void record_and_restart(struct perf_event *event, unsigned long val,
          */
         if (record) {
                 struct perf_sample_data data = {
-                        .addr   = 0,
+                        .addr   = ~0ULL,
                         .period = event->hw.last_period,
                 };
 
diff --git a/arch/powerpc/kernel/power5+-pmu.c b/arch/powerpc/kernel/power5+-pmu.c
index 0f4c1c73a6ad..199de527d411 100644
--- a/arch/powerpc/kernel/power5+-pmu.c
+++ b/arch/powerpc/kernel/power5+-pmu.c
@@ -73,10 +73,6 @@
 #define MMCR1_PMCSEL_MSK        0x7f
 
 /*
- * Bits in MMCRA
- */
-
-/*
  * Layout of constraint bits:
  * 6666555555555544444444443333333333222222222211111111110000000000
  * 3210987654321098765432109876543210987654321098765432109876543210
diff --git a/arch/powerpc/kernel/power5-pmu.c b/arch/powerpc/kernel/power5-pmu.c
index c351b3a57fbb..98b6a729a9dd 100644
--- a/arch/powerpc/kernel/power5-pmu.c
+++ b/arch/powerpc/kernel/power5-pmu.c
@@ -73,10 +73,6 @@
 #define MMCR1_PMCSEL_MSK        0x7f
 
 /*
- * Bits in MMCRA
- */
-
-/*
  * Layout of constraint bits:
  * 6666555555555544444444443333333333222222222211111111110000000000
  * 3210987654321098765432109876543210987654321098765432109876543210
@@ -390,7 +386,7 @@ static int power5_compute_mmcr(u64 event[], int n_ev,
                                unsigned int hwc[], unsigned long mmcr[])
 {
         unsigned long mmcr1 = 0;
-        unsigned long mmcra = 0;
+        unsigned long mmcra = MMCRA_SDAR_DCACHE_MISS | MMCRA_SDAR_ERAT_MISS;
         unsigned int pmc, unit, byte, psel;
         unsigned int ttm, grp;
         int i, isbus, bit, grsel;
diff --git a/arch/powerpc/kernel/power6-pmu.c b/arch/powerpc/kernel/power6-pmu.c
index ca399ba5034c..84a607bda8fb 100644
--- a/arch/powerpc/kernel/power6-pmu.c
+++ b/arch/powerpc/kernel/power6-pmu.c
@@ -178,7 +178,7 @@ static int p6_compute_mmcr(u64 event[], int n_ev,
                            unsigned int hwc[], unsigned long mmcr[])
 {
         unsigned long mmcr1 = 0;
-        unsigned long mmcra = 0;
+        unsigned long mmcra = MMCRA_SDAR_DCACHE_MISS | MMCRA_SDAR_ERAT_MISS;
         int i;
         unsigned int pmc, ev, b, u, s, psel;
         unsigned int ttmset = 0;
diff --git a/arch/powerpc/kernel/power7-pmu.c b/arch/powerpc/kernel/power7-pmu.c
index 28a4daacdc02..852f7b7f6b40 100644
--- a/arch/powerpc/kernel/power7-pmu.c
+++ b/arch/powerpc/kernel/power7-pmu.c
@@ -51,10 +51,6 @@
 #define MMCR1_PMCSEL_MSK        0xff
 
 /*
- * Bits in MMCRA
- */
-
-/*
  * Layout of constraint bits:
  * 6666555555555544444444443333333333222222222211111111110000000000
  * 3210987654321098765432109876543210987654321098765432109876543210
@@ -230,7 +226,7 @@ static int power7_compute_mmcr(u64 event[], int n_ev,
                                unsigned int hwc[], unsigned long mmcr[])
 {
         unsigned long mmcr1 = 0;
-        unsigned long mmcra = 0;
+        unsigned long mmcra = MMCRA_SDAR_DCACHE_MISS | MMCRA_SDAR_ERAT_MISS;
         unsigned int pmc, unit, combine, l2sel, psel;
         unsigned int pmc_inuse = 0;
         int i;
diff --git a/arch/powerpc/kernel/ppc970-pmu.c b/arch/powerpc/kernel/ppc970-pmu.c
index 479574413a93..8eff48e20dba 100644
--- a/arch/powerpc/kernel/ppc970-pmu.c
+++ b/arch/powerpc/kernel/ppc970-pmu.c
@@ -84,10 +84,6 @@ static short mmcr1_adder_bits[8] = {
 };
 
 /*
- * Bits in MMCRA
- */
-
-/*
  * Layout of constraint bits:
  * 6666555555555544444444443333333333222222222211111111110000000000
  * 3210987654321098765432109876543210987654321098765432109876543210
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 2ec1eaed19ca..c930ac38e59f 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -1172,7 +1172,7 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
         unsigned long base = mm->brk;
         unsigned long ret;
 
-#ifdef CONFIG_PPC64
+#ifdef CONFIG_PPC_STD_MMU_64
         /*
          * If we are using 1TB segments and we are allowed to randomise
          * the heap, we can put it above 1TB so it is backed by a 1TB
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 4271f7a655a3..845c72ab7357 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -660,6 +660,7 @@ late_initcall(check_cache_coherency);
 
 #ifdef CONFIG_DEBUG_FS
 struct dentry *powerpc_debugfs_root;
+EXPORT_SYMBOL(powerpc_debugfs_root);
 
 static int powerpc_debugfs_init(void)
 {
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 797ea95aae2e..04f638d82fb3 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -57,7 +57,6 @@
 #include <asm/cache.h>
 #include <asm/page.h>
 #include <asm/mmu.h>
-#include <asm/mmu-hash64.h>
 #include <asm/firmware.h>
 #include <asm/xmon.h>
 #include <asm/udbg.h>
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 92dc844299b6..36707dec94d7 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -54,6 +54,7 @@
 #include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/perf_event.h>
+#include <asm/trace.h>
 
 #include <asm/io.h>
 #include <asm/processor.h>
@@ -571,6 +572,8 @@ void timer_interrupt(struct pt_regs * regs)
         struct clock_event_device *evt = &decrementer->event;
         u64 now;
 
+        trace_timer_interrupt_entry(regs);
+
         /* Ensure a positive value is written to the decrementer, or else
          * some CPUs will continuue to take decrementer exceptions */
         set_dec(DECREMENTER_MAX);
@@ -590,6 +593,7 @@ void timer_interrupt(struct pt_regs * regs)
                 now = decrementer->next_tb - now;
                 if (now <= DECREMENTER_MAX)
                         set_dec((int)now);
+                trace_timer_interrupt_exit(regs);
                 return;
         }
         old_regs = set_irq_regs(regs);
@@ -620,6 +624,8 @@ void timer_interrupt(struct pt_regs * regs)
 
         irq_exit();
         set_irq_regs(old_regs);
+
+        trace_timer_interrupt_exit(regs);
 }
 
 void wakeup_decrementer(void)
@@ -777,7 +783,7 @@ int update_persistent_clock(struct timespec now)
         return ppc_md.set_rtc_time(&tm);
 }
 
-void read_persistent_clock(struct timespec *ts)
+static void __read_persistent_clock(struct timespec *ts)
 {
         struct rtc_time tm;
         static int first = 1;
@@ -800,10 +806,23 @@ void read_persistent_clock(struct timespec *ts)
                 return;
         }
         ppc_md.get_rtc_time(&tm);
+
         ts->tv_sec = mktime(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday,
                             tm.tm_hour, tm.tm_min, tm.tm_sec);
 }
 
+void read_persistent_clock(struct timespec *ts)
+{
+        __read_persistent_clock(ts);
+
+        /* Sanitize it in case real time clock is set below EPOCH */
+        if (ts->tv_sec < 0) {
+                ts->tv_sec = 0;
+                ts->tv_nsec = 0;
+        }
+                
+}
+
 /* clocksource code */
 static cycle_t rtc_read(struct clocksource *cs)
 {
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 6f0ae1a9bfae..9d1f9354d6ca 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -759,7 +759,7 @@ static int emulate_instruction(struct pt_regs *regs)
 
         /* Emulate the mfspr rD, PVR. */
         if ((instword & PPC_INST_MFSPR_PVR_MASK) == PPC_INST_MFSPR_PVR) {
-                PPC_WARN_EMULATED(mfpvr);
+                PPC_WARN_EMULATED(mfpvr, regs);
                 rd = (instword >> 21) & 0x1f;
                 regs->gpr[rd] = mfspr(SPRN_PVR);
                 return 0;
@@ -767,7 +767,7 @@ static int emulate_instruction(struct pt_regs *regs)
 
         /* Emulating the dcba insn is just a no-op.  */
         if ((instword & PPC_INST_DCBA_MASK) == PPC_INST_DCBA) {
-                PPC_WARN_EMULATED(dcba);
+                PPC_WARN_EMULATED(dcba, regs);
                 return 0;
         }
 
@@ -776,7 +776,7 @@ static int emulate_instruction(struct pt_regs *regs)
                 int shift = (instword >> 21) & 0x1c;
                 unsigned long msk = 0xf0000000UL >> shift;
 
-                PPC_WARN_EMULATED(mcrxr);
+                PPC_WARN_EMULATED(mcrxr, regs);
                 regs->ccr = (regs->ccr & ~msk) | ((regs->xer >> shift) & msk);
                 regs->xer &= ~0xf0000000UL;
                 return 0;
@@ -784,19 +784,19 @@ static int emulate_instruction(struct pt_regs *regs)
 
         /* Emulate load/store string insn. */
         if ((instword & PPC_INST_STRING_GEN_MASK) == PPC_INST_STRING) {
-                PPC_WARN_EMULATED(string);
+                PPC_WARN_EMULATED(string, regs);
                 return emulate_string_inst(regs, instword);
         }
 
         /* Emulate the popcntb (Population Count Bytes) instruction. */
         if ((instword & PPC_INST_POPCNTB_MASK) == PPC_INST_POPCNTB) {
-                PPC_WARN_EMULATED(popcntb);
+                PPC_WARN_EMULATED(popcntb, regs);
                 return emulate_popcntb_inst(regs, instword);
         }
 
         /* Emulate isel (Integer Select) instruction */
         if ((instword & PPC_INST_ISEL_MASK) == PPC_INST_ISEL) {
-                PPC_WARN_EMULATED(isel);
+                PPC_WARN_EMULATED(isel, regs);
                 return emulate_isel(regs, instword);
         }
 
@@ -995,7 +995,7 @@ void SoftwareEmulation(struct pt_regs *regs)
 #ifdef CONFIG_MATH_EMULATION
         errcode = do_mathemu(regs);
         if (errcode >= 0)
-                PPC_WARN_EMULATED(math);
+                PPC_WARN_EMULATED(math, regs);
 
         switch (errcode) {
         case 0:
@@ -1018,7 +1018,7 @@ void SoftwareEmulation(struct pt_regs *regs)
 #elif defined(CONFIG_8XX_MINIMAL_FPEMU)
         errcode = Soft_emulate_8xx(regs);
         if (errcode >= 0)
-                PPC_WARN_EMULATED(8xx);
+                PPC_WARN_EMULATED(8xx, regs);
 
         switch (errcode) {
         case 0:
@@ -1129,7 +1129,7 @@ void altivec_assist_exception(struct pt_regs *regs)
 
         flush_altivec_to_thread(current);
 
-        PPC_WARN_EMULATED(altivec);
+        PPC_WARN_EMULATED(altivec, regs);
         err = emulate_altivec(regs);
         if (err == 0) {
                 regs->nip += 4;         /* skip emulated instruction */
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index 94e2df3cae07..137dc22afa42 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -50,6 +50,9 @@
 /* Max supported size for symbol names */
 #define MAX_SYMNAME     64
 
+/* The alignment of the vDSO */
+#define VDSO_ALIGNMENT  (1 << 16)
+
 extern char vdso32_start, vdso32_end;
 static void *vdso32_kbase = &vdso32_start;
 static unsigned int vdso32_pages;
@@ -231,15 +234,21 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
          * pick a base address for the vDSO in process space. We try to put it
          * at vdso_base which is the "natural" base for it, but we might fail
          * and end up putting it elsewhere.
+         * Add enough to the size so that the result can be aligned.
          */
         down_write(&mm->mmap_sem);
         vdso_base = get_unmapped_area(NULL, vdso_base,
-                                      vdso_pages << PAGE_SHIFT, 0, 0);
+                                      (vdso_pages << PAGE_SHIFT) +
+                                      ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
+                                      0, 0);
         if (IS_ERR_VALUE(vdso_base)) {
                 rc = vdso_base;
                 goto fail_mmapsem;
         }
 
+        /* Add required alignment. */
+        vdso_base = ALIGN(vdso_base, VDSO_ALIGNMENT);
+
         /*
          * Put vDSO base into mm struct. We need to do this before calling
          * install_special_mapping or the perf counter mmap tracking code
diff --git a/arch/powerpc/kernel/vdso32/vdso32.lds.S b/arch/powerpc/kernel/vdso32/vdso32.lds.S
index 904ef1360dd7..0546bcd49cd0 100644
--- a/arch/powerpc/kernel/vdso32/vdso32.lds.S
+++ b/arch/powerpc/kernel/vdso32/vdso32.lds.S
@@ -25,7 +25,7 @@ SECTIONS
         . = ALIGN(16);
         .text           : {
                 *(.text .stub .text.* .gnu.linkonce.t.* __ftr_alt_*)
-        }
+        }                                               :text
         PROVIDE(__etext = .);
         PROVIDE(_etext = .);
         PROVIDE(etext = .);
@@ -56,7 +56,7 @@ SECTIONS
         .fixup          : { *(.fixup) }
 
         .dynamic        : { *(.dynamic) }               :text   :dynamic
-        .got            : { *(.got) }
+        .got            : { *(.got) }                   :text
         .plt            : { *(.plt) }
 
         _end = .;