Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Thomas Gleixner:
"Unbreak the CPUID CPUID_8000_0008_EBX reload which got dropped when
the evaluation of physical and virtual bits which uses the same CPUID
leaf was moved out of get_cpu_cap()"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/cpu: Restore CPUID_8000_0008_EBX reload
+5
-1
+5
-1
arch/x86/kernel/cpu/common.c
+5
-1
arch/x86/kernel/cpu/common.c
···
848
848
c->x86_power = edx;
849
849
}
850
850
851
+
if (c->extended_cpuid_level >= 0x80000008) {
852
+
cpuid(0x80000008, &eax, &ebx, &ecx, &edx);
853
+
c->x86_capability[CPUID_8000_0008_EBX] = ebx;
854
+
}
855
+
851
856
if (c->extended_cpuid_level >= 0x8000000a)
852
857
c->x86_capability[CPUID_8000_000A_EDX] = cpuid_edx(0x8000000a);
853
858
···
876
871
877
872
c->x86_virt_bits = (eax >> 8) & 0xff;
878
873
c->x86_phys_bits = eax & 0xff;
879
-
c->x86_capability[CPUID_8000_0008_EBX] = ebx;
880
874
}
881
875
#ifdef CONFIG_X86_32
882
876
else if (cpu_has(c, X86_FEATURE_PAE) || cpu_has(c, X86_FEATURE_PSE36))