File tree Expand file tree Collapse file tree 1 file changed +4
-6
lines changed Expand file tree Collapse file tree 1 file changed +4
-6
lines changed Original file line number Diff line number Diff line change @@ -1024,12 +1024,12 @@ static void __init cpu_set_bug_bits(struct cpuinfo_x86 *c)
1024
1024
* unless we can find a reliable way to detect all the broken cases.
1025
1025
* Enable it explicitly on 64-bit for non-constant inputs of cpu_has().
1026
1026
*/
1027
- static void detect_nopl (struct cpuinfo_x86 * c )
1027
+ static void detect_nopl (void )
1028
1028
{
1029
1029
#ifdef CONFIG_X86_32
1030
- clear_cpu_cap ( c , X86_FEATURE_NOPL );
1030
+ setup_clear_cpu_cap ( X86_FEATURE_NOPL );
1031
1031
#else
1032
- set_cpu_cap ( c , X86_FEATURE_NOPL );
1032
+ setup_force_cpu_cap ( X86_FEATURE_NOPL );
1033
1033
#endif
1034
1034
}
1035
1035
@@ -1108,7 +1108,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
1108
1108
if (!pgtable_l5_enabled ())
1109
1109
setup_clear_cpu_cap (X86_FEATURE_LA57 );
1110
1110
1111
- detect_nopl (c );
1111
+ detect_nopl ();
1112
1112
}
1113
1113
1114
1114
void __init early_cpu_init (void )
@@ -1206,8 +1206,6 @@ static void generic_identify(struct cpuinfo_x86 *c)
1206
1206
1207
1207
get_model_name (c ); /* Default name */
1208
1208
1209
- detect_nopl (c );
1210
-
1211
1209
detect_null_seg_behavior (c );
1212
1210
1213
1211
/*
You can’t perform that action at this time.
0 commit comments