diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 09:49:38 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 09:49:38 +0100 |
| commit | b1864e9a1afef41709886072c6e6248def0386f4 (patch) | |
| tree | 2fe749209cf860c1dd10efd1bd2ad8df572bd66e /arch/x86/include/asm/cpumask.h | |
| parent | e9c4ffb11f0b19005b5b9dc8481687a3637e5887 (diff) | |
| parent | 7032e8696726354d6180d8a2d17191f958cd93ae (diff) | |
Merge branch 'x86/core' into perfcounters/core
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/apic.c
arch/x86/kernel/setup_percpu.c
Diffstat (limited to 'arch/x86/include/asm/cpumask.h')
| -rw-r--r-- | arch/x86/include/asm/cpumask.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/include/asm/cpumask.h b/arch/x86/include/asm/cpumask.h index 26c6dad9047..a7f3c75f8ad 100644 --- a/arch/x86/include/asm/cpumask.h +++ b/arch/x86/include/asm/cpumask.h @@ -10,6 +10,8 @@ extern cpumask_var_t cpu_callout_mask; extern cpumask_var_t cpu_initialized_mask; extern cpumask_var_t cpu_sibling_setup_mask; +extern void setup_cpu_local_masks(void); + #else /* CONFIG_X86_32 */ extern cpumask_t cpu_callin_map; @@ -22,6 +24,8 @@ 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) +static inline void setup_cpu_local_masks(void) { } + #endif /* CONFIG_X86_32 */ #endif /* __ASSEMBLY__ */ |