Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

x86: apic - unify setup_apicpmtimer 



Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 7c37e48b

arch/x86/kernel/apic_32.c

+10 −0
Original line number Diff line number Diff line
@@ -1774,6 +1774,16 @@ static int __init parse_nolapic_timer(char *arg) 
}

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)

{

	if (!arg)  {

arch/x86/kernel/apic_64.c

+2 −0
Original line number Diff line number Diff line
@@ -1810,6 +1810,7 @@ static int __init parse_nolapic_timer(char *arg) 
}

early_param("nolapic_timer", parse_nolapic_timer);



#ifdef CONFIG_X86_64

static __init int setup_apicpmtimer(char *s)

{

	apic_calibrate_pmtmr = 1;
@@ -1817,6 +1818,7 @@ static __init int setup_apicpmtimer(char *s) 
	return 0;

}

__setup("apicpmtimer", setup_apicpmtimer);

#endif



static int __init apic_set_verbosity(char *arg)

{