diff options
author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2008-03-27 16:55:59 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:32 -0400 |
commit | 7b8cbd2c2f1bf9e3090d3c3fc09330ed1ca28d25 (patch) | |
tree | 019d3bb589ca67533fe772c2bae5fa7c03791ba9 /arch/x86/kernel/smpboot.c | |
parent | 1d8554326533568c7e9d5285600c3d0c027b45cc (diff) |
x86: move num_processors to smpboot.c (64 bit)
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r-- | arch/x86/kernel/smpboot.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index eee7768de2ae..fd0bdd36f4ea 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
@@ -84,13 +84,14 @@ u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata | |||
84 | = { [0 ... NR_CPUS-1] = BAD_APICID }; | 84 | = { [0 ... NR_CPUS-1] = BAD_APICID }; |
85 | void *x86_bios_cpu_apicid_early_ptr; | 85 | void *x86_bios_cpu_apicid_early_ptr; |
86 | 86 | ||
87 | /* Internal processor count */ | ||
88 | unsigned int num_processors; | ||
89 | unsigned disabled_cpus __cpuinitdata; | 87 | unsigned disabled_cpus __cpuinitdata; |
90 | 88 | ||
91 | u8 apicid_2_node[MAX_APICID]; | 89 | u8 apicid_2_node[MAX_APICID]; |
92 | #endif | 90 | #endif |
93 | 91 | ||
92 | /* Internal processor count */ | ||
93 | unsigned int num_processors; | ||
94 | |||
94 | /* Bitmask of physically existing CPUs */ | 95 | /* Bitmask of physically existing CPUs */ |
95 | physid_mask_t phys_cpu_present_map; | 96 | physid_mask_t phys_cpu_present_map; |
96 | 97 | ||