aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Starikovskiy <astarikovskiy@suse.de>2008-03-27 23:56:06 +0300
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:41:32 +0200
commit3103623eed1a3ea4a36ee26725842a8038760648 (patch)
treed4e8945cb716a078a8debce3c02ad1d20b5004dd
parent7b8cbd2c2f1bf9e3090d3c3fc09330ed1ca28d25 (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>
-rw-r--r--arch/x86/kernel/mpparse_64.c2
-rw-r--r--arch/x86/kernel/smpboot.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c
index 71f098414d0..a1d8d443298 100644
--- a/arch/x86/kernel/mpparse_64.c
+++ b/arch/x86/kernel/mpparse_64.c
@@ -60,8 +60,6 @@ int nr_ioapics;
unsigned int boot_cpu_physical_apicid = -1U;
EXPORT_SYMBOL(boot_cpu_physical_apicid);
-unsigned disabled_cpus __cpuinitdata;
-
#ifdef CONFIG_SMP
u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata
= {[0 ... NR_CPUS - 1] = BAD_APICID };
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index fd0bdd36f4e..f45d740b1b6 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
= { [0 ... NR_CPUS-1] = BAD_APICID };
void *x86_bios_cpu_apicid_early_ptr;
-unsigned disabled_cpus __cpuinitdata;
-
u8 apicid_2_node[MAX_APICID];
#endif
@@ -98,6 +96,8 @@ physid_mask_t phys_cpu_present_map;
/* State of each CPU */
DEFINE_PER_CPU(int, cpu_state) = { 0 };
+unsigned disabled_cpus __cpuinitdata;
+
/* Store all idle threads, this can be reused instead of creating
* a new thread. Also avoids complicated thread destroy functionality
* for idle threads.