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

Commit 9175fc06 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: use setup_clear_cpu_cap() when disabling the lapic 



... so don't need to call clear_cpu_cap again in early_identify_cpu,
and could use cleared_cpu_caps like other places.

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 6ac8d51f

arch/x86/kernel/apic_32.c

+1 −4
Original line number Diff line number Diff line
@@ -1214,9 +1214,6 @@ int apic_version[MAX_APICS]; 


int __init APIC_init_uniprocessor(void)

{

	if (disable_apic)

		clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);



	if (!smp_found_config && !cpu_has_apic)

		return -1;
@@ -1700,7 +1697,7 @@ early_param("lapic", parse_lapic); 
static int __init parse_nolapic(char *arg)

{

	disable_apic = 1;

	clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);

	setup_clear_cpu_cap(X86_FEATURE_APIC);

	return 0;

}

early_param("nolapic", parse_nolapic);

arch/x86/kernel/apic_64.c

+1 −1
Original line number Diff line number Diff line
@@ -1337,7 +1337,7 @@ early_param("apic", apic_set_verbosity); 
static __init int setup_disableapic(char *str)

{

	disable_apic = 1;

	clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);

	setup_clear_cpu_cap(X86_FEATURE_APIC);

	return 0;

}

early_param("disableapic", setup_disableapic);

arch/x86/kernel/cpu/common_64.c

+0 −4
Original line number Diff line number Diff line
@@ -324,10 +324,6 @@ static void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c) 
		cpu_devs[c->x86_vendor]->c_early_init(c);



	validate_pat_support(c);



	/* early_param could clear that, but recall get it set again */

	if (disable_apic)

		clear_cpu_cap(c, X86_FEATURE_APIC);

}



/*