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

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

arch/x86/kernel/apic_32.c

+2 −2
Original line number Diff line number Diff line
@@ -114,6 +114,8 @@ static DEFINE_PER_CPU(struct clock_event_device, lapic_events); 
static int enabled_via_apicbase;



static unsigned long apic_phys;

unsigned int __cpuinitdata maxcpus = NR_CPUS;





/*

 * Get the LAPIC version
@@ -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)

{

	int cpu;

arch/x86/kernel/apic_64.c

+1 −1
Original line number Diff line number Diff line
@@ -98,10 +98,10 @@ static struct clock_event_device lapic_clockevent = { 
static DEFINE_PER_CPU(struct clock_event_device, lapic_events);



static unsigned long apic_phys;

unsigned int __cpuinitdata maxcpus = NR_CPUS;



unsigned long mp_lapic_addr;



unsigned int __cpuinitdata maxcpus = NR_CPUS;

/*

 * Get the LAPIC version

 */