From 6cdb258c9f617e940ceb8fca86d27a77b6018ba3 Mon Sep 17 00:00:00 2001
From: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Date: Mon, 14 Jan 2008 21:42:56 +0100
Subject: [PATCH] --- yaml --- r: 99237 b: refs/heads/master c:
 d704fb0cc0cce474ac959adca6c3d1f606fcfa2a h: refs/heads/master i:   99235:
 d112b1fa132323c51877a5e7184db3e7b40916fb v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/avr32/kernel/entry-avr32b.S | 9 +++++----
 trunk/arch/avr32/kernel/vmlinux.lds.S  | 8 --------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 15b91fc016eb..c18c4fb13a04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b72b52cab872396c93d808d7fa14017e9061430
+refs/heads/master: d704fb0cc0cce474ac959adca6c3d1f606fcfa2a
diff --git a/trunk/arch/avr32/kernel/entry-avr32b.S b/trunk/arch/avr32/kernel/entry-avr32b.S
index 5f31702d6b1c..050c006a7f0c 100644
--- a/trunk/arch/avr32/kernel/entry-avr32b.S
+++ b/trunk/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/trunk/arch/avr32/kernel/vmlinux.lds.S b/trunk/arch/avr32/kernel/vmlinux.lds.S
index 481cfd40c053..033dd46bfa62 100644
--- a/trunk/arch/avr32/kernel/vmlinux.lds.S
+++ b/trunk/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