From 8b99a871fae485c72f4420f0c666eb1d86bfe2b0 Mon Sep 17 00:00:00 2001
From: "Steven J. Magnani" <steve@digidescorp.com>
Date: Fri, 9 Apr 2010 22:03:37 -0500
Subject: [PATCH] --- yaml --- r: 190659 b: refs/heads/master c:
 7a0248e819ddaf2c2f28e6edd287b90aa930702a h: refs/heads/master i:   190657:
 a2275f31d5b1ed7a78899a0264701099727394fc   190655:
 317f9719beba37fa95e028f8ccc37d5c5b291c41 v: v3

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

diff --git a/[refs] b/[refs]
index ec913e332986..a03e60a13001 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6d7961e5be0a259ba87411370f8be7f7da4c0f6
+refs/heads/master: 7a0248e819ddaf2c2f28e6edd287b90aa930702a
diff --git a/trunk/arch/microblaze/kernel/head.S b/trunk/arch/microblaze/kernel/head.S
index da6a5f5dc766..1bf739888260 100644
--- a/trunk/arch/microblaze/kernel/head.S
+++ b/trunk/arch/microblaze/kernel/head.S
@@ -28,6 +28,7 @@
  * for more details.
  */
 
+#include <linux/init.h>
 #include <linux/linkage.h>
 #include <asm/thread_info.h>
 #include <asm/page.h>
@@ -49,7 +50,7 @@ swapper_pg_dir:
 
 #endif /* CONFIG_MMU */
 
-	.text
+	__HEAD
 ENTRY(_start)
 #if CONFIG_KERNEL_BASE_ADDR == 0
 	brai	TOPHYS(real_start)
diff --git a/trunk/arch/microblaze/kernel/vmlinux.lds.S b/trunk/arch/microblaze/kernel/vmlinux.lds.S
index 5ef619aad634..db72d7124602 100644
--- a/trunk/arch/microblaze/kernel/vmlinux.lds.S
+++ b/trunk/arch/microblaze/kernel/vmlinux.lds.S
@@ -24,7 +24,8 @@ SECTIONS {
 	.text : AT(ADDR(.text) - LOAD_OFFSET) {
 		_text = . ;
 		_stext = . ;
-		*(.text .text.*)
+		HEAD_TEXT
+		TEXT_TEXT
 		*(.fixup)
 		EXIT_TEXT
 		EXIT_CALL