From 7c290eda524a55fc4ba07ebed803dc8accadb563 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 6 Jul 2011 10:53:22 +0100
Subject: [PATCH] --- yaml --- r: 258211 b: refs/heads/master c:
 e2f81844efa2d44d326bef48e1c9e48926162bc6 h: refs/heads/master i:   258209:
 99f58bf28918a53814d05aa9f304eb0f90928d38   258207:
 5dcf7cfcfc50d5e047ab5db47ae3fdf1340ec531 v: v3

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

diff --git a/[refs] b/[refs]
index 4c186f49393f..6b931f3e618f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3835d69a6c7048a28d0aea3cb8403d5e83a0f867
+refs/heads/master: e2f81844efa2d44d326bef48e1c9e48926162bc6
diff --git a/trunk/arch/arm/kernel/vmlinux.lds.S b/trunk/arch/arm/kernel/vmlinux.lds.S
index 18574b7dbc14..bf977f8514f6 100644
--- a/trunk/arch/arm/kernel/vmlinux.lds.S
+++ b/trunk/arch/arm/kernel/vmlinux.lds.S
@@ -66,11 +66,11 @@ SECTIONS
 	. = PAGE_OFFSET + TEXT_OFFSET;
 #endif
 	.head.text : {
-		_stext = .;
+		_text = .;
 		HEAD_TEXT
 	}
 	.text : {			/* Real text segment		*/
-		_text = .;		/* Text and read-only data	*/
+		_stext = .;		/* Text and read-only data	*/
 			__exception_text_start = .;
 			*(.exception.text)
 			__exception_text_end = .;