diff options
| author | Glauber Costa <gcosta@redhat.com> | 2008-03-03 14:12:31 -0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 17:40:52 +0200 |
| commit | 53ebef4961c7d5347b4fa2b878258ccd11fc9663 (patch) | |
| tree | f772233c7d982e9f5e5c83a7142410784505c043 /include/asm-x86 | |
| parent | 639acb16e6b93342a786c01425cf8eb8ebbb1351 (diff) | |
x86: merge extern variables definitions
move extern definitions that are the same between smp_{32,64}.h
to smp.h
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86')
| -rw-r--r-- | include/asm-x86/smp.h | 6 | ||||
| -rw-r--r-- | include/asm-x86/smp_32.h | 4 | ||||
| -rw-r--r-- | include/asm-x86/smp_64.h | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h index ad7b99dda0d..c130a87c956 100644 --- a/include/asm-x86/smp.h +++ b/include/asm-x86/smp.h @@ -1,6 +1,12 @@ #ifndef _ASM_X86_SMP_H_ #define _ASM_X86_SMP_H_ #ifndef __ASSEMBLY__ +#include <linux/cpumask.h> + +extern cpumask_t cpu_callout_map; + +extern int smp_num_siblings; +extern unsigned int num_processors; #ifdef CONFIG_X86_32 # include "smp_32.h" diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h index 27812258ac6..9a4057d9436 100644 --- a/include/asm-x86/smp_32.h +++ b/include/asm-x86/smp_32.h @@ -16,12 +16,8 @@ # endif #endif -extern cpumask_t cpu_callout_map; extern cpumask_t cpu_callin_map; -extern int smp_num_siblings; -extern unsigned int num_processors; - extern void (*mtrr_hook) (void); extern void zap_low_mappings (void); diff --git a/include/asm-x86/smp_64.h b/include/asm-x86/smp_64.h index 2c21df289da..284f701f2a8 100644 --- a/include/asm-x86/smp_64.h +++ b/include/asm-x86/smp_64.h @@ -13,12 +13,8 @@ #include <asm/pda.h> #include <asm/thread_info.h> -extern cpumask_t cpu_callout_map; extern cpumask_t cpu_initialized; -extern int smp_num_siblings; -extern unsigned int num_processors; - extern int smp_call_function_mask(cpumask_t mask, void (*func)(void *), void *info, int wait); |