---

yaml --- r: 136405 b: refs/heads/master c: 52811d8 h: refs/heads/master i: 136403: 797736b v: v3
git-mirror · Jan 10, 2009 · bd1e087 · bd1e087
1 parent 1c9a5f4
commit bd1e087
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 493f6ca54e1ea59732dd334e35c5fe2d8e440b06
+refs/heads/master: 52811d8c9beb67da6bc4b770de3c4134376788a1
diff --git a/trunk/arch/x86/include/asm/cpumask.h b/trunk/arch/x86/include/asm/cpumask.h
@@ -8,16 +8,19 @@
 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)
 
 #endif /* CONFIG_X86_32 */
 

diff --git a/trunk/arch/x86/include/asm/smp.h b/trunk/arch/x86/include/asm/smp.h
@@ -19,18 +19,6 @@
 #include <asm/thread_info.h>
 #include <asm/cpumask.h>
 
-#ifdef CONFIG_X86_64
-
-extern cpumask_var_t cpu_sibling_setup_mask;
-
-#else /* CONFIG_X86_32 */
-
-extern cpumask_t cpu_sibling_setup_map;
-
-#define cpu_sibling_setup_mask	((struct cpumask *)&cpu_sibling_setup_map)
-
-#endif /* CONFIG_X86_32 */
-
 extern int __cpuinit get_local_pda(int cpu);
 
 extern int smp_num_siblings;