Commit b6c80513 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar

x86: apic - rearrange maxcpu definition

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d5e629a6
...@@ -114,6 +114,8 @@ static DEFINE_PER_CPU(struct clock_event_device, lapic_events); ...@@ -114,6 +114,8 @@ static DEFINE_PER_CPU(struct clock_event_device, lapic_events);
static int enabled_via_apicbase; static int enabled_via_apicbase;
static unsigned long apic_phys; static unsigned long apic_phys;
unsigned int __cpuinitdata maxcpus = NR_CPUS;
/* /*
* Get the LAPIC version * Get the LAPIC version
...@@ -1459,8 +1461,6 @@ void disconnect_bsp_APIC(int virt_wire_setup) ...@@ -1459,8 +1461,6 @@ void disconnect_bsp_APIC(int virt_wire_setup)
} }
} }
unsigned int __cpuinitdata maxcpus = NR_CPUS;
void __cpuinit generic_processor_info(int apicid, int version) void __cpuinit generic_processor_info(int apicid, int version)
{ {
int cpu; int cpu;
......
...@@ -98,10 +98,10 @@ static struct clock_event_device lapic_clockevent = { ...@@ -98,10 +98,10 @@ static struct clock_event_device lapic_clockevent = {
static DEFINE_PER_CPU(struct clock_event_device, lapic_events); static DEFINE_PER_CPU(struct clock_event_device, lapic_events);
static unsigned long apic_phys; static unsigned long apic_phys;
unsigned int __cpuinitdata maxcpus = NR_CPUS;
unsigned long mp_lapic_addr; unsigned long mp_lapic_addr;
unsigned int __cpuinitdata maxcpus = NR_CPUS;
/* /*
* Get the LAPIC version * Get the LAPIC version
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment