Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
arch
/
x86
/
kernel
/
cpu
/
common.c
diff --git
a/kernel/arch/x86/kernel/cpu/common.c
b/kernel/arch/x86/kernel/cpu/common.c
index
c2b7522
..
637ca41
100644
(file)
--- a/
kernel/arch/x86/kernel/cpu/common.c
+++ b/
kernel/arch/x86/kernel/cpu/common.c
@@
-737,21
+737,20
@@
static void __init early_identify_cpu(struct cpuinfo_x86 *c)
identify_cpu_without_cpuid(c);
/* cyrix could have cpuid enabled via c_identify()*/
identify_cpu_without_cpuid(c);
/* cyrix could have cpuid enabled via c_identify()*/
- if (!have_cpuid_p())
- return;
+ if (have_cpuid_p()) {
+ cpu_detect(c);
+ get_cpu_vendor(c);
+ get_cpu_cap(c);
- cpu_detect(c);
- get_cpu_vendor(c);
- get_cpu_cap(c);
-
- if (this_cpu->c_early_init)
- this_cpu->c_early_init(c);
+ if (this_cpu->c_early_init)
+ this_cpu->c_early_init(c);
- c->cpu_index = 0;
- filter_cpuid_features(c, false);
+
c->cpu_index = 0;
+
filter_cpuid_features(c, false);
- if (this_cpu->c_bsp_init)
- this_cpu->c_bsp_init(c);
+ if (this_cpu->c_bsp_init)
+ this_cpu->c_bsp_init(c);
+ }
setup_force_cpu_cap(X86_FEATURE_ALWAYS);
fpu__init_system(c);
setup_force_cpu_cap(X86_FEATURE_ALWAYS);
fpu__init_system(c);
@@
-1130,7
+1129,7
@@
static __init int setup_disablecpuid(char *arg)
{
int bit;
{
int bit;
- if (get_option(&arg, &bit) && bit
< NCAPINTS*
32)
+ if (get_option(&arg, &bit) && bit
>= 0 && bit < NCAPINTS *
32)
setup_clear_cpu_cap(bit);
else
return 0;
setup_clear_cpu_cap(bit);
else
return 0;