From 14de82ec4918f86c70de9d95c70b435265b7adbc Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@MIT.EDU>
Date: Sat, 25 Apr 2009 22:10:57 -0400
Subject: [PATCH] --- yaml --- r: 144159 b: refs/heads/master c:
 0ebdcb4d0480d1b8219cf5f9eab0fb5d889af0ad h: refs/heads/master i:   144157:
 81041a13d958dc5ac859f43eefa518e6d68d59d6   144155:
 c7da80b9cfe9710bc11df6268a1c60d443115df5   144151:
 14d014a502194e8315eac8d06471009eb78dbfeb   144143:
 91f5364e5e51e86d700e622f19066199172a1c40   144127:
 5611be41294991ce0bfcccf64de38068488ae2f2 v: v3

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

diff --git a/[refs] b/[refs]
index 373fe290116d..4105184caad6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c80d471a476b6d6fe0bc1fd25293c24c66b7aaaf
+refs/heads/master: 0ebdcb4d0480d1b8219cf5f9eab0fb5d889af0ad
diff --git a/trunk/arch/xtensa/kernel/head.S b/trunk/arch/xtensa/kernel/head.S
index 0817f9db836e..d9ddc1ba761c 100644
--- a/trunk/arch/xtensa/kernel/head.S
+++ b/trunk/arch/xtensa/kernel/head.S
@@ -19,6 +19,7 @@
 #include <asm/page.h>
 #include <asm/cacheasm.h>
 
+#include <linux/init.h>
 #include <linux/linkage.h>
 
 /*
@@ -45,7 +46,7 @@
 	 * instruction.
 	 */
 
-	.section .head.text, "ax"
+	__HEAD
 	.globl _start
 _start:	_j	2f
 	.align	4
diff --git a/trunk/arch/xtensa/kernel/vmlinux.lds.S b/trunk/arch/xtensa/kernel/vmlinux.lds.S
index c1be9a4a740c..5accf51053da 100644
--- a/trunk/arch/xtensa/kernel/vmlinux.lds.S
+++ b/trunk/arch/xtensa/kernel/vmlinux.lds.S
@@ -85,8 +85,8 @@ SECTIONS
 
   .text :
   {
-    /* The .head.text section must be the first section! */
-    *(.head.text)
+    /* The HEAD_TEXT section must be the first section! */
+    HEAD_TEXT
     *(.literal .text)
     VMLINUX_SYMBOL(__sched_text_start) = .;
     *(.sched.literal .sched.text)