From de3409fe84180192bea53afd68c4ee6a4ae8eed3 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@MIT.EDU>
Date: Sat, 25 Apr 2009 22:11:07 -0400
Subject: [PATCH] --- yaml --- r: 144167 b: refs/heads/master c:
 bbe215c231ac809e42b037345c1fa8e8eb09b00a h: refs/heads/master i:   144165:
 ad3fd410000c867279597e27453dafc1de4a83a2   144163:
 db5d0c6cda3f96da5e8947c811468af0e27eb0fc   144159:
 14de82ec4918f86c70de9d95c70b435265b7adbc v: v3

---
 [refs]                                | 2 +-
 trunk/arch/sh/kernel/head_32.S        | 3 ++-
 trunk/arch/sh/kernel/head_64.S        | 5 ++++-
 trunk/arch/sh/kernel/vmlinux_32.lds.S | 2 +-
 trunk/arch/sh/kernel/vmlinux_64.lds.S | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 249c2a985622..65e8bcf1c715 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2133bb8d8c691c08d47f16d5971ba98f0ac241bf
+refs/heads/master: bbe215c231ac809e42b037345c1fa8e8eb09b00a
diff --git a/trunk/arch/sh/kernel/head_32.S b/trunk/arch/sh/kernel/head_32.S
index 788605ff7088..a78be74b8d3e 100644
--- a/trunk/arch/sh/kernel/head_32.S
+++ b/trunk/arch/sh/kernel/head_32.S
@@ -10,6 +10,7 @@
  *
  * Head.S contains the SH exception handlers and startup code.
  */
+#include <linux/init.h>
 #include <linux/linkage.h>
 #include <asm/thread_info.h>
 
@@ -40,7 +41,7 @@ ENTRY(empty_zero_page)
 1:
 	.skip	PAGE_SIZE - empty_zero_page - 1b
 
-	.section	.text.head, "ax"
+	__HEAD
 
 /*
  * Condition at the entry of _stext:
diff --git a/trunk/arch/sh/kernel/head_64.S b/trunk/arch/sh/kernel/head_64.S
index 7ccfb995a398..3ea765844c74 100644
--- a/trunk/arch/sh/kernel/head_64.S
+++ b/trunk/arch/sh/kernel/head_64.S
@@ -8,6 +8,9 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  */
+
+#include <linux/init.h>
+
 #include <asm/page.h>
 #include <asm/cache.h>
 #include <asm/tlb.h>
@@ -110,7 +113,7 @@ empty_bad_pte_table:
 fpu_in_use:	.quad	0
 
 
-	.section	.text.head, "ax"
+	__HEAD
 	.balign L1_CACHE_BYTES
 /*
  * Condition at the entry of __stext:
diff --git a/trunk/arch/sh/kernel/vmlinux_32.lds.S b/trunk/arch/sh/kernel/vmlinux_32.lds.S
index d0b2a715cd14..dd9b2ee1312d 100644
--- a/trunk/arch/sh/kernel/vmlinux_32.lds.S
+++ b/trunk/arch/sh/kernel/vmlinux_32.lds.S
@@ -31,7 +31,7 @@ SECTIONS
 	} = 0
 
 	.text : {
-		*(.text.head)
+		HEAD_TEXT
 		TEXT_TEXT
 		SCHED_TEXT
 		LOCK_TEXT
diff --git a/trunk/arch/sh/kernel/vmlinux_64.lds.S b/trunk/arch/sh/kernel/vmlinux_64.lds.S
index 33fa46451406..69664460c688 100644
--- a/trunk/arch/sh/kernel/vmlinux_64.lds.S
+++ b/trunk/arch/sh/kernel/vmlinux_64.lds.S
@@ -42,7 +42,7 @@ SECTIONS
 	} = 0
 
 	.text : C_PHYS(.text) {
-		*(.text.head)
+		HEAD_TEXT
 		TEXT_TEXT
 		*(.text64)
 		*(.text..SHmedia32)