From d38b8bddae846544c723bf90f57783ed8ce55d8b Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@MIT.EDU>
Date: Sat, 25 Apr 2009 22:10:59 -0400
Subject: [PATCH] --- yaml --- r: 144161 b: refs/heads/master c:
 b6a8d95c95814079ded93c14c4b394015d8b65cd h: refs/heads/master i:   144159:
 14de82ec4918f86c70de9d95c70b435265b7adbc v: v3

---
 [refs]                              | 2 +-
 trunk/arch/frv/kernel/head.S        | 3 ++-
 trunk/arch/frv/kernel/vmlinux.lds.S | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9328963d2d9e..8db1bd930846 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92ca52343ca503c1f957bd649df4ef914d5fc1e8
+refs/heads/master: b6a8d95c95814079ded93c14c4b394015d8b65cd
diff --git a/trunk/arch/frv/kernel/head.S b/trunk/arch/frv/kernel/head.S
index fecf751c5cae..b825ef3f2d54 100644
--- a/trunk/arch/frv/kernel/head.S
+++ b/trunk/arch/frv/kernel/head.S
@@ -9,6 +9,7 @@
  * 2 of the License, or (at your option) any later version.
  */
 
+#include <linux/init.h>
 #include <linux/threads.h>
 #include <linux/linkage.h>
 #include <asm/thread_info.h>
@@ -27,7 +28,7 @@
 #   command line string
 #
 ###############################################################################
-	.section	.text.head,"ax"
+	__HEAD
 	.balign		4
 
 	.globl		_boot, __head_reference
diff --git a/trunk/arch/frv/kernel/vmlinux.lds.S b/trunk/arch/frv/kernel/vmlinux.lds.S
index b95c4eace62f..22d9787406ed 100644
--- a/trunk/arch/frv/kernel/vmlinux.lds.S
+++ b/trunk/arch/frv/kernel/vmlinux.lds.S
@@ -26,7 +26,7 @@ SECTIONS
 
   _sinittext = .;
   .init.text : {
-	*(.text.head)
+	HEAD_TEXT
 #ifndef CONFIG_DEBUG_INFO
 	INIT_TEXT
 	EXIT_TEXT