From ccea871a91e25f17bcab1d01efcdd7ea95744e29 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Wed, 6 Feb 2008 22:39:45 +0100
Subject: [PATCH] --- yaml --- r: 83707 b: refs/heads/master c:
 f1fbabb312d657262322f4ce68b30a95f501945c h: refs/heads/master i:   83705:
 a121d2db331e090070d6bc14247505bec5c15bc5   83703:
 9531333d12a60f755791cc9c812e256f9ed6c254 v: v3

---
 [refs]                          |  2 +-
 trunk/arch/x86/kernel/head_64.S | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 0262adb61ef4..83333120dea8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f9975a55dbcd82ff4a222691a6dcd7b3145b9c0
+refs/heads/master: f1fbabb312d657262322f4ce68b30a95f501945c
diff --git a/trunk/arch/x86/kernel/head_64.S b/trunk/arch/x86/kernel/head_64.S
index 4f283ad215ec..09b38d539b09 100644
--- a/trunk/arch/x86/kernel/head_64.S
+++ b/trunk/arch/x86/kernel/head_64.S
@@ -250,18 +250,13 @@ ENTRY(secondary_startup_64)
 	lretq
 
 	/* SMP bootup changes these two */
-#ifndef CONFIG_HOTPLUG_CPU
-	.pushsection .init.data
-#endif
+	__CPUINITDATA
 	.align	8
-	.globl	initial_code
-initial_code:
+	ENTRY(initial_code)
 	.quad	x86_64_start_kernel
-#ifndef CONFIG_HOTPLUG_CPU
-	.popsection
-#endif
-	.globl init_rsp
-init_rsp:
+	__FINITDATA
+
+	ENTRY(init_rsp)
 	.quad  init_thread_union+THREAD_SIZE-8
 
 bad_address: