aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/apic_32.c4
-rw-r--r--arch/x86/kernel/apic_64.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 41134d4e6a66..8d1febf05da1 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -114,6 +114,8 @@ static DEFINE_PER_CPU(struct clock_event_device, lapic_events);
114static int enabled_via_apicbase; 114static int enabled_via_apicbase;
115 115
116static unsigned long apic_phys; 116static unsigned long apic_phys;
117unsigned int __cpuinitdata maxcpus = NR_CPUS;
118
117 119
118/* 120/*
119 * Get the LAPIC version 121 * Get the LAPIC version
@@ -1459,8 +1461,6 @@ void disconnect_bsp_APIC(int virt_wire_setup)
1459 } 1461 }
1460} 1462}
1461 1463
1462unsigned int __cpuinitdata maxcpus = NR_CPUS;
1463
1464void __cpuinit generic_processor_info(int apicid, int version) 1464void __cpuinit generic_processor_info(int apicid, int version)
1465{ 1465{
1466 int cpu; 1466 int cpu;
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index ad532dccd11e..46acb9b47ae7 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -98,10 +98,10 @@ static struct clock_event_device lapic_clockevent = {
98static DEFINE_PER_CPU(struct clock_event_device, lapic_events); 98static DEFINE_PER_CPU(struct clock_event_device, lapic_events);
99 99
100static unsigned long apic_phys; 100static unsigned long apic_phys;
101unsigned int __cpuinitdata maxcpus = NR_CPUS;
101 102
102unsigned long mp_lapic_addr; 103unsigned long mp_lapic_addr;
103 104
104unsigned int __cpuinitdata maxcpus = NR_CPUS;
105/* 105/*
106 * Get the LAPIC version 106 * Get the LAPIC version
107 */ 107 */