From ce5e638cb892e136863e24f114210a0d1200cc8e Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Sun, 22 Jul 2007 11:12:45 +0200
Subject: [PATCH] --- yaml --- r: 62488 b: refs/heads/master c:
 92417df076f75738ae22956f7ea1b9b98f59fa7a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0b3848ca0baa..3fae3a88d75c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dec2e6b7aa5d45bc3508e19907a7716b0c5307e5
+refs/heads/master: 92417df076f75738ae22956f7ea1b9b98f59fa7a
diff --git a/trunk/arch/x86_64/kernel/head.S b/trunk/arch/x86_64/kernel/head.S
index 941c84baecc8..e89abcdbdde8 100644
--- a/trunk/arch/x86_64/kernel/head.S
+++ b/trunk/arch/x86_64/kernel/head.S
@@ -25,7 +25,7 @@
  */
 
 	.text
-	.section .bootstrap.text
+	.section .text.head
 	.code64
 	.globl startup_64
 startup_64:
@@ -243,10 +243,16 @@ ENTRY(secondary_startup_64)
 	lretq
 
 	/* SMP bootup changes these two */
+#ifndef CONFIG_HOTPLUG_CPU
+	.pushsection .init.data
+#endif
 	.align	8
 	.globl	initial_code
 initial_code:
 	.quad	x86_64_start_kernel
+#ifndef CONFIG_HOTPLUG_CPU
+	.popsection
+#endif
 	.globl init_rsp
 init_rsp:
 	.quad  init_thread_union+THREAD_SIZE-8
diff --git a/trunk/arch/x86_64/kernel/vmlinux.lds.S b/trunk/arch/x86_64/kernel/vmlinux.lds.S
index e7a5eb6cd785..ba8ea97abd21 100644
--- a/trunk/arch/x86_64/kernel/vmlinux.lds.S
+++ b/trunk/arch/x86_64/kernel/vmlinux.lds.S
@@ -28,7 +28,7 @@ SECTIONS
   _text = .;			/* Text and read-only data */
   .text :  AT(ADDR(.text) - LOAD_OFFSET) {
 	/* First the code that has to be first for bootstrapping */
-	*(.bootstrap.text)
+	*(.text.head)
 	_stext = .;
 	/* Then the rest */
 	TEXT_TEXT