x86: use setup_clear_cpu_cap() when disabling the lapic

yhlu · Ingo Molnar · commit 9175fc06aee7 · 2008-07-21T13:03:12.000+02:00
... 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: Yinghai Lu &lt;yhlu.kernel@gmail.com&gt;
Signed-off-by: Ingo Molnar &lt;mingo@elte.hu&gt;
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
@@ -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);
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
@@ -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);
diff --git a/arch/x86/kernel/cpu/common_64.c b/arch/x86/kernel/cpu/common_64.c
@@ -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);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -1214,9 +1214,6 @@ int apic_version[MAX_APICS];`
`1214`	`1214`
`1215`	`1215`	`int __init APIC_init_uniprocessor(void)`
`1216`	`1216`	`{`
`1217`		`- if (disable_apic)`
`1218`		`- clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);`
`1219`		`-`
`1220`	`1217`	`if (!smp_found_config && !cpu_has_apic)`
`1221`	`1218`	`return -1;`
`1222`	`1219`
`@@ -1700,7 +1697,7 @@ early_param("lapic", parse_lapic);`
`1700`	`1697`	`static int __init parse_nolapic(char *arg)`
`1701`	`1698`	`{`
`1702`	`1699`	`disable_apic = 1;`
`1703`		`- clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);`
	`1700`	`+ setup_clear_cpu_cap(X86_FEATURE_APIC);`
`1704`	`1701`	`return 0;`
`1705`	`1702`	`}`
`1706`	`1703`	`early_param("nolapic", parse_nolapic);`
Original file line number	Diff line number	Diff line change
`@@ -1337,7 +1337,7 @@ early_param("apic", apic_set_verbosity);`
`1337`	`1337`	`static __init int setup_disableapic(char *str)`
`1338`	`1338`	`{`
`1339`	`1339`	`disable_apic = 1;`
`1340`		`- clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);`
	`1340`	`+ setup_clear_cpu_cap(X86_FEATURE_APIC);`
`1341`	`1341`	`return 0;`
`1342`	`1342`	`}`
`1343`	`1343`	`early_param("disableapic", setup_disableapic);`
Original file line number	Diff line number	Diff line change
`@@ -324,10 +324,6 @@ static void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c)`
`324`	`324`	`cpu_devs[c->x86_vendor]->c_early_init(c);`
`325`	`325`
`326`	`326`	`validate_pat_support(c);`
`327`		`-`
`328`		`- /* early_param could clear that, but recall get it set again */`
`329`		`- if (disable_apic)`
`330`		`- clear_cpu_cap(c, X86_FEATURE_APIC);`
`331`	`327`	`}`
`332`	`328`
`333`	`329`	`/*`