From bb466d55854f8e4d76e834e49171459154a1a6cc Mon Sep 17 00:00:00 2001
From: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Date: Sat, 10 Jan 2009 12:17:37 +0530
Subject: [PATCH] --- yaml --- r: 136402 b: refs/heads/master c:
 068790334cececc3d2d945617ccc585477da2e38 h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/arch/x86/include/asm/cpumask.h | 19 +++++++++++++++++++
 trunk/arch/x86/include/asm/smp.h     |  3 ---
 trunk/arch/x86/kernel/cpu/common.c   |  1 +
 trunk/arch/x86/kernel/setup_percpu.c |  1 +
 trunk/arch/x86/kernel/smpboot.c      |  1 +
 6 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 trunk/arch/x86/include/asm/cpumask.h

diff --git a/[refs] b/[refs]
index 0cb04411eec6..d8ed78aa50aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1de8cd3cb9f61e854e743c7210df43db517d4832
+refs/heads/master: 068790334cececc3d2d945617ccc585477da2e38
diff --git a/trunk/arch/x86/include/asm/cpumask.h b/trunk/arch/x86/include/asm/cpumask.h
new file mode 100644
index 000000000000..308dddd56329
--- /dev/null
+++ b/trunk/arch/x86/include/asm/cpumask.h
@@ -0,0 +1,19 @@
+#ifndef _ASM_X86_CPUMASK_H
+#define _ASM_X86_CPUMASK_H
+#ifndef __ASSEMBLY__
+#include <linux/cpumask.h>
+
+#ifdef CONFIG_X86_64
+
+extern cpumask_var_t cpu_callin_mask;
+
+#else /* CONFIG_X86_32 */
+
+extern cpumask_t cpu_callin_map;
+
+#define cpu_callin_mask		((struct cpumask *)&cpu_callin_map)
+
+#endif /* CONFIG_X86_32 */
+
+#endif /* __ASSEMBLY__ */
+#endif /* _ASM_X86_CPUMASK_H */
diff --git a/trunk/arch/x86/include/asm/smp.h b/trunk/arch/x86/include/asm/smp.h
index 1963e27673c9..c35aa5c0dd11 100644
--- a/trunk/arch/x86/include/asm/smp.h
+++ b/trunk/arch/x86/include/asm/smp.h
@@ -20,19 +20,16 @@
 
 #ifdef CONFIG_X86_64
 
-extern cpumask_var_t cpu_callin_mask;
 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_callin_map;
 extern cpumask_t cpu_callout_map;
 extern cpumask_t cpu_initialized;
 extern cpumask_t cpu_sibling_setup_map;
 
-#define cpu_callin_mask		((struct cpumask *)&cpu_callin_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/cpu/common.c b/trunk/arch/x86/kernel/cpu/common.c
index 14e543b6fd4f..f00258462444 100644
--- a/trunk/arch/x86/kernel/cpu/common.c
+++ b/trunk/arch/x86/kernel/cpu/common.c
@@ -22,6 +22,7 @@
 #include <asm/numa.h>
 #include <asm/smp.h>
 #include <asm/cpu.h>
+#include <asm/cpumask.h>
 #ifdef CONFIG_X86_LOCAL_APIC
 #include <asm/mpspec.h>
 #include <asm/apic.h>
diff --git a/trunk/arch/x86/kernel/setup_percpu.c b/trunk/arch/x86/kernel/setup_percpu.c
index 55c46074eba0..bf63de72b643 100644
--- a/trunk/arch/x86/kernel/setup_percpu.c
+++ b/trunk/arch/x86/kernel/setup_percpu.c
@@ -13,6 +13,7 @@
 #include <asm/mpspec.h>
 #include <asm/apicdef.h>
 #include <asm/highmem.h>
+#include <asm/cpumask.h>
 
 #ifdef CONFIG_X86_LOCAL_APIC
 unsigned int num_processors;
diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c
index 6c2b8444b830..84ac1cf46d87 100644
--- a/trunk/arch/x86/kernel/smpboot.c
+++ b/trunk/arch/x86/kernel/smpboot.c
@@ -55,6 +55,7 @@
 #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>