From 797736b2a7e00ccf9e8268409b10786f65c0f8e4 Mon Sep 17 00:00:00 2001
From: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Date: Sat, 10 Jan 2009 12:20:24 +0530
Subject: [PATCH] --- yaml --- r: 136403 b: refs/heads/master c:
 fb8fd077fbf0de6662acfd240e8e6b25cf3202ca h: refs/heads/master i:   136401:
 0f0b728d4ba98727b8eab17ea0100bc9f0f59ace   136399:
 75be3e2afae4377beabbc18aceb72b1d5cbd042f v: v3

---
 [refs]                               | 2 +-
 trunk/arch/x86/include/asm/cpumask.h | 3 +++
 trunk/arch/x86/include/asm/smp.h     | 4 +---
 trunk/arch/x86/kernel/smpboot.c      | 1 -
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d8ed78aa50aa..985949813b16 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 068790334cececc3d2d945617ccc585477da2e38
+refs/heads/master: fb8fd077fbf0de6662acfd240e8e6b25cf3202ca
diff --git a/trunk/arch/x86/include/asm/cpumask.h b/trunk/arch/x86/include/asm/cpumask.h
index 308dddd56329..9933fcad3c82 100644
--- a/trunk/arch/x86/include/asm/cpumask.h
+++ b/trunk/arch/x86/include/asm/cpumask.h
@@ -6,12 +6,15 @@
 #ifdef CONFIG_X86_64
 
 extern cpumask_var_t cpu_callin_mask;
+extern cpumask_var_t cpu_callout_mask;
 
 #else /* CONFIG_X86_32 */
 
 extern cpumask_t cpu_callin_map;
+extern cpumask_t cpu_callout_map;
 
 #define cpu_callin_mask		((struct cpumask *)&cpu_callin_map)
+#define cpu_callout_mask	((struct cpumask *)&cpu_callout_map)
 
 #endif /* CONFIG_X86_32 */
 
diff --git a/trunk/arch/x86/include/asm/smp.h b/trunk/arch/x86/include/asm/smp.h
index c35aa5c0dd11..a3afec5cad0b 100644
--- a/trunk/arch/x86/include/asm/smp.h
+++ b/trunk/arch/x86/include/asm/smp.h
@@ -17,20 +17,18 @@
 #endif
 #include <asm/pda.h>
 #include <asm/thread_info.h>
+#include <asm/cpumask.h>
 
 #ifdef CONFIG_X86_64
 
-extern cpumask_var_t cpu_callout_mask;
 extern cpumask_var_t cpu_initialized_mask;
 extern cpumask_var_t cpu_sibling_setup_mask;
 
 #else /* CONFIG_X86_32 */
 
-extern cpumask_t cpu_callout_map;
 extern cpumask_t cpu_initialized;
 extern cpumask_t cpu_sibling_setup_map;
 
-#define cpu_callout_mask	((struct cpumask *)&cpu_callout_map)
 #define cpu_initialized_mask	((struct cpumask *)&cpu_initialized)
 #define cpu_sibling_setup_mask	((struct cpumask *)&cpu_sibling_setup_map)
 
diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c
index 84ac1cf46d87..6c2b8444b830 100644
--- a/trunk/arch/x86/kernel/smpboot.c
+++ b/trunk/arch/x86/kernel/smpboot.c
@@ -55,7 +55,6 @@
 #include <asm/idle.h>
 #include <asm/trampoline.h>
 #include <asm/cpu.h>
-#include <asm/cpumask.h>
 #include <asm/numa.h>
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>