evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86: apic_xx.c order variables

Browse source 
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu 2008-08-24 02:01:46 -07:00 • committed by Ingo Molnar
parent 6460bc73aa
commit b3c5117050
2 changed files with 56 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
arch/x86/kernel/apic_32.c
View file

@ -50,16 +50,37 @@
# error SPURIOUS_APIC_VECTOR definition error # error SPURIOUS_APIC_VECTOR definition error
#endif #endif
unsigned long mp_lapic_addr; #ifdef CONFIG_X86_32
/* /*
* Knob to control our willingness to enable the local APIC. * Knob to control our willingness to enable the local APIC.
* *
* +1=force-enable * +1=force-enable
*/ */
static int force_enable_local_apic; 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);
#endif
#ifdef CONFIG_X86_64
static int apic_calibrate_pmtmr __initdata;
static __init int setup_apicpmtimer(char *s)
{
apic_calibrate_pmtmr = 1;
notsc_setup(NULL);
return 0;
}
__setup("apicpmtimer", setup_apicpmtimer);
#endif
unsigned long mp_lapic_addr;
int disable_apic;
/* Disable local APIC timer from the kernel commandline or via dmi quirk */ /* Disable local APIC timer from the kernel commandline or via dmi quirk */
static int disable_apic_timer __cpuinitdata; static int disable_apic_timer __cpuinitdata;
/* Local APIC timer works in C2 */ /* Local APIC timer works in C2 */
@ -1742,15 +1763,6 @@ static void apic_pm_activate(void) { }
#endif /* CONFIG_PM */ #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) static int __init setup_disableapic(char *arg)
{ {
@ -1788,16 +1800,6 @@ static int __init parse_nolapic_timer(char *arg)
} }
early_param("nolapic_timer", parse_nolapic_timer); early_param("nolapic_timer", parse_nolapic_timer);
#ifdef CONFIG_X86_64
static __init int setup_apicpmtimer(char *s)
{
apic_calibrate_pmtmr = 1;
notsc_setup(NULL);
return 0;
}
__setup("apicpmtimer", setup_apicpmtimer);
#endif
static int __init apic_set_verbosity(char *arg) static int __init apic_set_verbosity(char *arg)
{ {
if (!arg) { if (!arg) {

48
arch/x86/kernel/apic_64.c
View file

@ -53,16 +53,44 @@
# error SPURIOUS_APIC_VECTOR definition error # error SPURIOUS_APIC_VECTOR definition error
#endif #endif
/* Disable local APIC timer from the kernel commandline or via dmi quirk */ #ifdef CONFIG_X86_32
static int disable_apic_timer __cpuinitdata; /*
* Knob to control our willingness to enable the local APIC.
*
* +1=force-enable
*/
static int force_enable_local_apic;
/*
* APIC command line parameters
*/
static int __init parse_lapic(char *arg)
{
force_enable_local_apic = 1;
return 0;
}
early_param("lapic", parse_lapic);
#endif
#ifdef CONFIG_X86_64
static int apic_calibrate_pmtmr __initdata; static int apic_calibrate_pmtmr __initdata;
int disable_apic; static __init int setup_apicpmtimer(char *s)
{
apic_calibrate_pmtmr = 1;
notsc_setup(NULL);
return 0;
}
__setup("apicpmtimer", setup_apicpmtimer);
#endif
int disable_x2apic; int disable_x2apic;
int x2apic; int x2apic;
/* x2apic enabled before OS handover */ /* x2apic enabled before OS handover */
int x2apic_preenabled; int x2apic_preenabled;
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 */ /* Local APIC timer works in C2 */
int local_apic_timer_c2_ok; int local_apic_timer_c2_ok;
EXPORT_SYMBOL_GPL(local_apic_timer_c2_ok); EXPORT_SYMBOL_GPL(local_apic_timer_c2_ok);
@ -113,8 +141,6 @@ static DEFINE_PER_CPU(struct clock_event_device, lapic_events);
static unsigned long apic_phys; static unsigned long apic_phys;
unsigned long mp_lapic_addr;
/* /*
* Get the LAPIC version * Get the LAPIC version
*/ */
@ -1858,16 +1884,6 @@ static int __init parse_nolapic_timer(char *arg)
} }
early_param("nolapic_timer", parse_nolapic_timer); early_param("nolapic_timer", parse_nolapic_timer);
#ifdef CONFIG_X86_64
static __init int setup_apicpmtimer(char *s)
{
apic_calibrate_pmtmr = 1;
notsc_setup(NULL);
return 0;
}
__setup("apicpmtimer", setup_apicpmtimer);
#endif
static int __init apic_set_verbosity(char *arg) static int __init apic_set_verbosity(char *arg)
{ {
if (!arg) { if (!arg) {