From 03f2fe7bbb3eb3319c3e99b79246312c07745d55 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@MIT.EDU>
Date: Sat, 25 Apr 2009 22:11:06 -0400
Subject: [PATCH] --- yaml --- r: 144166 b: refs/heads/master c:
 2133bb8d8c691c08d47f16d5971ba98f0ac241bf h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 297ba7e2c946..249c2a985622 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e70398458738fd26f96adc95eea8efe908809f08
+refs/heads/master: 2133bb8d8c691c08d47f16d5971ba98f0ac241bf
diff --git a/trunk/arch/s390/kernel/head.S b/trunk/arch/s390/kernel/head.S
index bba14494ee00..22596d70fc2e 100644
--- a/trunk/arch/s390/kernel/head.S
+++ b/trunk/arch/s390/kernel/head.S
@@ -23,6 +23,7 @@
  *
  */
 
+#include <linux/init.h>
 #include <asm/setup.h>
 #include <asm/lowcore.h>
 #include <asm/asm-offsets.h>
@@ -35,7 +36,7 @@
 #define ARCH_OFFSET	0
 #endif
 
-.section ".text.head","ax"
+__HEAD
 #ifndef CONFIG_IPL
 	.org   0
 	.long  0x00080000,0x80000000+startup	# Just a restart PSW
diff --git a/trunk/arch/s390/kernel/vmlinux.lds.S b/trunk/arch/s390/kernel/vmlinux.lds.S
index 7a2063eb88f0..89399b8756c2 100644
--- a/trunk/arch/s390/kernel/vmlinux.lds.S
+++ b/trunk/arch/s390/kernel/vmlinux.lds.S
@@ -29,8 +29,8 @@ SECTIONS
 	. = 0x00000000;
 	.text : {
 	_text = .;		/* Text and read-only data */
-		*(.text.head)
-	TEXT_TEXT
+		HEAD_TEXT
+		TEXT_TEXT
 		SCHED_TEXT
 		LOCK_TEXT
 		KPROBES_TEXT