From 63b431b5564516808eaf9327a669a442ce6fa5eb Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Wed, 28 Nov 2007 16:22:05 -0800
Subject: [PATCH] --- yaml --- r: 74387 b: refs/heads/master c:
 3c835670ab5f72a4ea2d0db232b1acc07924f186 h: refs/heads/master i:   74385:
 f36bfa768f1cc937c60b1d63feb931029798850d   74383:
 b1c4a99c8d07ac6a6ad42fdd79d5a8ae7579e831 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/frv/kernel/break.S       |  2 +-
 trunk/arch/frv/kernel/entry.S       |  2 +-
 trunk/arch/frv/kernel/vmlinux.lds.S | 27 +++++++++++++++------------
 trunk/arch/frv/mm/tlb-miss.S        |  2 +-
 5 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index df0abd48e65b..c9a3d6a745f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e6c1e633355b69803094ecbac4cecc96e00965c
+refs/heads/master: 3c835670ab5f72a4ea2d0db232b1acc07924f186
diff --git a/trunk/arch/frv/kernel/break.S b/trunk/arch/frv/kernel/break.S
index dac4a5f68c2e..bd0bdf908d93 100644
--- a/trunk/arch/frv/kernel/break.S
+++ b/trunk/arch/frv/kernel/break.S
@@ -63,7 +63,7 @@ __break_trace_through_exceptions:
 # entry point for Break Exceptions/Interrupts
 #
 ###############################################################################
-	.text
+	.section	.text.break
 	.balign		4
 	.globl		__entry_break
 __entry_break:
diff --git a/trunk/arch/frv/kernel/entry.S b/trunk/arch/frv/kernel/entry.S
index 1e74f3c5cee2..f926c7094776 100644
--- a/trunk/arch/frv/kernel/entry.S
+++ b/trunk/arch/frv/kernel/entry.S
@@ -38,7 +38,7 @@
 
 #define nr_syscalls ((syscall_table_size)/4)
 
-	.text
+	.section	.text.entry
 	.balign		4
 
 .macro LEDS val
diff --git a/trunk/arch/frv/kernel/vmlinux.lds.S b/trunk/arch/frv/kernel/vmlinux.lds.S
index 3b71e0c86399..a17a81d58bf6 100644
--- a/trunk/arch/frv/kernel/vmlinux.lds.S
+++ b/trunk/arch/frv/kernel/vmlinux.lds.S
@@ -76,6 +76,12 @@ SECTIONS
 	  *(.data.init_task)
   }
 
+  . = ALIGN(4096);
+  .data.page_aligned : { *(.data.idt) }
+
+  . = ALIGN(L1_CACHE_BYTES);
+  .data.cacheline_aligned : { *(.data.cacheline_aligned) }
+
   .trap : {
 	/* trap table management - read entry-table.S before modifying */
 	. = ALIGN(8192);
@@ -86,28 +92,25 @@ SECTIONS
 	*(.trap.break)
   }
 
-  . = ALIGN(4096);
-  .data.page_aligned : { *(.data.idt) }
-
-  . = ALIGN(L1_CACHE_BYTES);
-  .data.cacheline_aligned : { *(.data.cacheline_aligned) }
-
   /* Text and read-only data */
   . = ALIGN(4);
   _text = .;
   _stext = .;
   .text : {
-	*(
-		.text.start .text.*
+	*(.text.start)
+	*(.text.entry)
+	*(.text.break)
+	*(.text.tlbmiss)
+	TEXT_TEXT
+	SCHED_TEXT
+	LOCK_TEXT
 #ifdef CONFIG_DEBUG_INFO
+	*(
 	.init.text
 	.exit.text
 	.exitcall.exit
-#endif
 	)
-	TEXT_TEXT
-	SCHED_TEXT
-	LOCK_TEXT
+#endif
 	*(.fixup)
 	*(.gnu.warning)
 	*(.exitcall.exit)
diff --git a/trunk/arch/frv/mm/tlb-miss.S b/trunk/arch/frv/mm/tlb-miss.S
index 04da67468378..07643482cad2 100644
--- a/trunk/arch/frv/mm/tlb-miss.S
+++ b/trunk/arch/frv/mm/tlb-miss.S
@@ -16,7 +16,7 @@
 #include <asm/highmem.h>
 #include <asm/spr-regs.h>
 
-	.section	.text
+	.section	.text.tlbmiss
 	.balign		4
 
 	.globl		__entry_insn_mmu_miss