From b19bbef9137b5fd81fdaa9c3a4081e62409eee76 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Fri, 20 Jul 2007 04:33:08 +0100
Subject: [PATCH] --- yaml --- r: 61913 b: refs/heads/master c:
 7e5de05169b766b86b4bc7c196f53d57e1952bff h: refs/heads/master i:   61911:
 0ae4fdb9a66863d5ce7c9b7f0602ecd0cb11d3c2 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/m68k/kernel/head.S           | 2 +-
 trunk/arch/m68k/kernel/sun3-head.S      | 2 +-
 trunk/arch/m68k/kernel/vmlinux-std.lds  | 1 +
 trunk/arch/m68k/kernel/vmlinux-sun3.lds | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f104a665fe47..b139a313f365 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9569e1d1540791f664aeb935b1ec11b6e56507c
+refs/heads/master: 7e5de05169b766b86b4bc7c196f53d57e1952bff
diff --git a/trunk/arch/m68k/kernel/head.S b/trunk/arch/m68k/kernel/head.S
index 05741f233567..faa6764f1d13 100644
--- a/trunk/arch/m68k/kernel/head.S
+++ b/trunk/arch/m68k/kernel/head.S
@@ -577,7 +577,7 @@ func_define	putn,1
 #endif
 .endm
 
-.text
+.section ".text.head","ax"
 ENTRY(_stext)
 /*
  * Version numbers of the bootinfo interface
diff --git a/trunk/arch/m68k/kernel/sun3-head.S b/trunk/arch/m68k/kernel/sun3-head.S
index 4b5f050204e8..aad01592dbbc 100644
--- a/trunk/arch/m68k/kernel/sun3-head.S
+++ b/trunk/arch/m68k/kernel/sun3-head.S
@@ -29,7 +29,7 @@ kernel_pmd_table:              .skip 0x2000
 .globl kernel_pg_dir
 .equ    kernel_pg_dir,kernel_pmd_table
 
-	.section .head
+	.section .text.head
 ENTRY(_stext)
 ENTRY(_start)
 
diff --git a/trunk/arch/m68k/kernel/vmlinux-std.lds b/trunk/arch/m68k/kernel/vmlinux-std.lds
index 40f02b128f22..c42245775a4d 100644
--- a/trunk/arch/m68k/kernel/vmlinux-std.lds
+++ b/trunk/arch/m68k/kernel/vmlinux-std.lds
@@ -11,6 +11,7 @@ SECTIONS
   . = 0x1000;
   _text = .;			/* Text and read-only data */
   .text : {
+	*(.text.head)
 	TEXT_TEXT
 	SCHED_TEXT
 	LOCK_TEXT
diff --git a/trunk/arch/m68k/kernel/vmlinux-sun3.lds b/trunk/arch/m68k/kernel/vmlinux-sun3.lds
index f06425b6d206..4adffefb5c48 100644
--- a/trunk/arch/m68k/kernel/vmlinux-sun3.lds
+++ b/trunk/arch/m68k/kernel/vmlinux-sun3.lds
@@ -11,7 +11,7 @@ SECTIONS
   . = 0xE002000;
   _text = .;			/* Text and read-only data */
   .text : {
-	*(.head)
+	*(.text.head)
 	TEXT_TEXT
 	SCHED_TEXT
 	LOCK_TEXT