From 5cad14702098b225fb31ac611e1fd6472bcd0921 Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@novell.com>
Date: Wed, 30 Jan 2008 13:33:14 +0100
Subject: [PATCH] --- yaml --- r: 80296 b: refs/heads/master c:
 c0400030b28e95fd477fdfe8ba8acb0af21e5c15 h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/x86/kernel/vmlinux_64.lds.S | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 0fc33e405d66..808bea53fd9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c11b68bc8b1f7c7daaea2220e0a8d9f7d391cb8d
+refs/heads/master: c0400030b28e95fd477fdfe8ba8acb0af21e5c15
diff --git a/trunk/arch/x86/kernel/vmlinux_64.lds.S b/trunk/arch/x86/kernel/vmlinux_64.lds.S
index ea5386944e67..7457370d7916 100644
--- a/trunk/arch/x86/kernel/vmlinux_64.lds.S
+++ b/trunk/arch/x86/kernel/vmlinux_64.lds.S
@@ -37,16 +37,15 @@ SECTIONS
 	KPROBES_TEXT
 	*(.fixup)
 	*(.gnu.warning)
-	} :text = 0x9090
-  				/* out-of-line lock text */
-  .text.lock : AT(ADDR(.text.lock) - LOAD_OFFSET) { *(.text.lock) }
-
-  _etext = .;			/* End of text section */
+	_etext = .;			/* End of text section */
+  } :text = 0x9090
 
   . = ALIGN(16);		/* Exception table */
-  __start___ex_table = .;
-  __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { *(__ex_table) }
-  __stop___ex_table = .;
+  __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {
+  	__start___ex_table = .;
+	 *(__ex_table)
+  	__stop___ex_table = .;
+  }
 
   NOTES :text :note