diff options
author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2008-03-27 16:56:06 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:32 -0400 |
commit | 3103623eed1a3ea4a36ee26725842a8038760648 (patch) | |
tree | d4e8945cb716a078a8debce3c02ad1d20b5004dd /arch/x86 | |
parent | 7b8cbd2c2f1bf9e3090d3c3fc09330ed1ca28d25 (diff) |
x86: move disabled_cpus to smpboot.c (64bit)
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/mpparse_64.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/smpboot.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c index 71f098414d0b..a1d8d4432988 100644 --- a/arch/x86/kernel/mpparse_64.c +++ b/arch/x86/kernel/mpparse_64.c | |||
@@ -60,8 +60,6 @@ int nr_ioapics; | |||
60 | unsigned int boot_cpu_physical_apicid = -1U; | 60 | unsigned int boot_cpu_physical_apicid = -1U; |
61 | EXPORT_SYMBOL(boot_cpu_physical_apicid); | 61 | EXPORT_SYMBOL(boot_cpu_physical_apicid); |
62 | 62 | ||
63 | unsigned disabled_cpus __cpuinitdata; | ||
64 | |||
65 | #ifdef CONFIG_SMP | 63 | #ifdef CONFIG_SMP |
66 | u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata | 64 | u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata |
67 | = {[0 ... NR_CPUS - 1] = BAD_APICID }; | 65 | = {[0 ... NR_CPUS - 1] = BAD_APICID }; |
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index fd0bdd36f4ea..f45d740b1b6a 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
@@ -84,8 +84,6 @@ 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 | unsigned disabled_cpus __cpuinitdata; | ||
88 | |||
89 | u8 apicid_2_node[MAX_APICID]; | 87 | u8 apicid_2_node[MAX_APICID]; |
90 | #endif | 88 | #endif |
91 | 89 | ||
@@ -98,6 +96,8 @@ physid_mask_t phys_cpu_present_map; | |||
98 | /* State of each CPU */ | 96 | /* State of each CPU */ |
99 | DEFINE_PER_CPU(int, cpu_state) = { 0 }; | 97 | DEFINE_PER_CPU(int, cpu_state) = { 0 }; |
100 | 98 | ||
99 | unsigned disabled_cpus __cpuinitdata; | ||
100 | |||
101 | /* Store all idle threads, this can be reused instead of creating | 101 | /* Store all idle threads, this can be reused instead of creating |
102 | * a new thread. Also avoids complicated thread destroy functionality | 102 | * a new thread. Also avoids complicated thread destroy functionality |
103 | * for idle threads. | 103 | * for idle threads. |