avr32: Kill special exception handler sections

Kill the special exception handler sections .tlbx.ex.text,
.tlbr.ex.text, tlbw.ex.text and .scall.text. Use .org instead to place
the handlers at the required offsets from EVBA.

Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

2 files changed, 5 insertions, 12 deletions

diff --git a/arch/avr32/kernel/entry-avr32b.S b/arch/avr32/kernel/entry-avr32b.S
index 5f31702d6b1c..050c006a7f0c 100644
--- a/arch/avr32/kernel/entry-avr32b.S
+++ b/arch/avr32/kernel/entry-avr32b.S
@@ -83,22 +83,23 @@ exception_vectors:
 #define tlbmiss_save    pushm   r0-r3
 #define tlbmiss_restore popm    r0-r3
 
-        .section .tlbx.ex.text,"ax",@progbits
+        .org    0x50
         .global itlb_miss
 itlb_miss:
         tlbmiss_save
         rjmp    tlb_miss_common
 
-        .section .tlbr.ex.text,"ax",@progbits
+        .org    0x60
 dtlb_miss_read:
         tlbmiss_save
         rjmp    tlb_miss_common
 
-        .section .tlbw.ex.text,"ax",@progbits
+        .org    0x70
 dtlb_miss_write:
         tlbmiss_save
 
         .global tlb_miss_common
+        .align  2
 tlb_miss_common:
         mfsr    r0, SYSREG_TLBEAR
         mfsr    r1, SYSREG_PTBR
@@ -157,7 +158,7 @@ handle_vmalloc_miss:
 
         /* ---                    System Call                    --- */
 
-        .section .scall.text,"ax",@progbits
+        .org    0x100
 system_call:
 #ifdef CONFIG_PREEMPT
         mask_interrupts
diff --git a/arch/avr32/kernel/vmlinux.lds.S b/arch/avr32/kernel/vmlinux.lds.S
index 481cfd40c053..033dd46bfa62 100644
--- a/arch/avr32/kernel/vmlinux.lds.S
+++ b/arch/avr32/kernel/vmlinux.lds.S
@@ -68,14 +68,6 @@ SECTIONS
                 _evba = .;
                 _text = .;
                 *(.ex.text)
-                . = 0x50;
-                *(.tlbx.ex.text)
-                . = 0x60;
-                *(.tlbr.ex.text)
-                . = 0x70;
-                *(.tlbw.ex.text)
-                . = 0x100;
-                *(.scall.text)
                 *(.irq.text)
                 KPROBES_TEXT
                 TEXT_TEXT