From 58142bb1214544d44da0bf16c7491ee46efb3837 Mon Sep 17 00:00:00 2001
From: Vivek Goyal <vgoyal@in.ibm.com>
Date: Fri, 5 Jan 2007 16:36:34 -0800
Subject: [PATCH] --- yaml --- r: 45248 b: refs/heads/master c:
 3771a450cf47fa64f36c53ba61e36aa2ec84a86b h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/i386/kernel/smpboot.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 36c814bbdd1f..6c4f75cde3d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9dbeeec91e8f4a200ac56af5004473fa6099520f
+refs/heads/master: 3771a450cf47fa64f36c53ba61e36aa2ec84a86b
diff --git a/trunk/arch/i386/kernel/smpboot.c b/trunk/arch/i386/kernel/smpboot.c
index aef39be81361..300d9b38d02e 100644
--- a/trunk/arch/i386/kernel/smpboot.c
+++ b/trunk/arch/i386/kernel/smpboot.c
@@ -227,7 +227,7 @@ static struct {
 	atomic_t count_start;
 	atomic_t count_stop;
 	unsigned long long values[NR_CPUS];
-} tsc __initdata = {
+} tsc __cpuinitdata = {
 	.start_flag = ATOMIC_INIT(0),
 	.count_start = ATOMIC_INIT(0),
 	.count_stop = ATOMIC_INIT(0),
@@ -332,7 +332,7 @@ static void __init synchronize_tsc_bp(void)
 		printk("passed.\n");
 }
 
-static void __init synchronize_tsc_ap(void)
+static void __cpuinit synchronize_tsc_ap(void)
 {
 	int i;