x86: apic_xx.c order variables
PATCH 1/1 x86: apic_xx.c order variables
Signed-off-by Yinghai Lu <[email protected]>
arch/x86/kernel/apic_32.c +14 -17
@@ -50,16 +50,27 @@# error SPURIOUS_APIC_VECTOR definition error#endif -unsigned long mp_lapic_addr; -/* * Knob to control our willingness to enable the local APIC. * * +1=force-enable */ static int force_enable_local_apic; -int disable_apic; +/* +* APIC command line parameters +*/ +static int __init parse_lapic (char *arg) +{ + force_enable_local_apic =1 ; +return 0 ; +} +early_param ("lapic" , parse_lapic); +/* Local APIC was disabled by the BIOS and enabled by the kernel */ +static int enabled_via_apicbase; +int pic_mode; +unsigned long mp_lapic_addr; +int disable_apic;/* Disable local APIC timer from the kernel commandline or via dmi quirk */ static int disable_apic_timer__cpuinitdata ;/* Local APIC timer works in C2 */
@@ -75,8 +86,6 @@ char system_vectors[NR_VECTORS] = { [0 ... NR_VECTORS-1] = SYS_VECTOR_FREE};*/ unsigned int apic_verbosity; -int pic_mode; -/* Have we found an MP table */ int smp_found_config;
@@ -110,9 +119,6 @@ static struct clock_event_device lapic_clockevent = { }; static DEFINE_PER_CPU(struct clock_event_device, lapic_events); -/* Local APIC was disabled by the BIOS and enabled by the kernel */ -static int enabled_via_apicbase; -static unsigned long apic_phys;/*
@@ -1728,15 +1734,6 @@ static void apic_pm_activate(void) { }#endif /* CONFIG_PM */ -/* -* APIC command line parameters -*/ -static int __init parse_lapic (char *arg) -{ - force_enable_local_apic =1 ; -return 0 ; -} -early_param ("lapic" , parse_lapic);static int __init setup_disableapic (char *arg) {
arch/x86/kernel/apic_64.c +20 -24
73 lines not on this page · raw message