From 1c9a5f42c8585bb6b6c2c977fe2bf64ad8e0deda Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Rajput Date: Sat, 10 Jan 2009 12:48:22 +0530 Subject: [PATCH] --- yaml --- r: 136404 b: refs/heads/master c: 493f6ca54e1ea59732dd334e35c5fe2d8e440b06 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/cpumask.h | 3 +++ trunk/arch/x86/include/asm/smp.h | 3 --- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 985949813b16..d51d3a70b228 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb8fd077fbf0de6662acfd240e8e6b25cf3202ca +refs/heads/master: 493f6ca54e1ea59732dd334e35c5fe2d8e440b06 diff --git a/trunk/arch/x86/include/asm/cpumask.h b/trunk/arch/x86/include/asm/cpumask.h index 9933fcad3c82..d4cfd120b84d 100644 --- a/trunk/arch/x86/include/asm/cpumask.h +++ b/trunk/arch/x86/include/asm/cpumask.h @@ -7,14 +7,17 @@ extern cpumask_var_t cpu_callin_mask; extern cpumask_var_t cpu_callout_mask; +extern cpumask_var_t cpu_initialized_mask; #else /* CONFIG_X86_32 */ extern cpumask_t cpu_callin_map; extern cpumask_t cpu_callout_map; +extern cpumask_t cpu_initialized; #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) #endif /* CONFIG_X86_32 */ diff --git a/trunk/arch/x86/include/asm/smp.h b/trunk/arch/x86/include/asm/smp.h index a3afec5cad0b..7d2a80319e82 100644 --- a/trunk/arch/x86/include/asm/smp.h +++ b/trunk/arch/x86/include/asm/smp.h @@ -21,15 +21,12 @@ #ifdef CONFIG_X86_64 -extern cpumask_var_t cpu_initialized_mask; extern cpumask_var_t cpu_sibling_setup_mask; #else /* CONFIG_X86_32 */ -extern cpumask_t cpu_initialized; extern cpumask_t cpu_sibling_setup_map; -#define cpu_initialized_mask ((struct cpumask *)&cpu_initialized) #define cpu_sibling_setup_mask ((struct cpumask *)&cpu_sibling_setup_map) #endif /* CONFIG_X86_32 */