From 6da25517a09d03e5099313843045db16b3c08eb2 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Thu, 17 Jul 2008 21:50:23 -0700
Subject: [PATCH] --- yaml --- r: 104304 b: refs/heads/master c:
 29cbeb0e17d9d2ca824f62f71cfa7360b3157112 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index cac9e8126ef7..8b8bddf5c5e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd569ef5d6ff9f43e9504f1ffc7fdbe356518149
+refs/heads/master: 29cbeb0e17d9d2ca824f62f71cfa7360b3157112
diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c
index 687376ab07e8..27456574f070 100644
--- a/trunk/arch/x86/kernel/smpboot.c
+++ b/trunk/arch/x86/kernel/smpboot.c
@@ -1311,7 +1311,7 @@ static void __ref remove_cpu_from_maps(int cpu)
 	cpu_clear(cpu, cpu_callout_map);
 	cpu_clear(cpu, cpu_callin_map);
 	/* was set by cpu_init() */
-	clear_bit(cpu, (unsigned long *)&cpu_initialized);
+	cpu_clear(cpu, cpu_initialized);
 	numa_remove_cpu(cpu);
 }