diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-11 19:46:20 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-11 19:46:20 -0500 |
| commit | 671d5532aaad777782b66eff71bc4dfad25f942d (patch) | |
| tree | fdd480fbd7bd8078c60e1fe3eea98a8cefb8df67 /arch/x86/include/asm/cpu.h | |
| parent | 67c707e451e12f59e57bca6cf33b5803cb74b022 (diff) | |
| parent | 0007bccc3cfd1e69deb0fd73ccc426b4cedb061d (diff) | |
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cpu updates from Ingo Molnar:
"The main changes in this cycle were:
- Improved CPU ID handling code and related enhancements (Borislav
Petkov)
- RDRAND fix (Len Brown)"
* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Replace RDRAND forced-reseed with simple sanity check
x86/MSR: Chop off lower 32-bit value
x86/cpu: Fix MSR value truncation issue
x86/cpu/amd, kvm: Satisfy guest kernel reads of IC_CFG MSR
kvm: Add accessors for guest CPU's family, model, stepping
x86/cpu: Unify CPU family, model, stepping calculation
Diffstat (limited to 'arch/x86/include/asm/cpu.h')
| -rw-r--r-- | arch/x86/include/asm/cpu.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h index bf2caa1dedc5..678637ad7476 100644 --- a/arch/x86/include/asm/cpu.h +++ b/arch/x86/include/asm/cpu.h | |||
| @@ -36,4 +36,7 @@ extern int _debug_hotplug_cpu(int cpu, int action); | |||
| 36 | 36 | ||
| 37 | int mwait_usable(const struct cpuinfo_x86 *); | 37 | int mwait_usable(const struct cpuinfo_x86 *); |
| 38 | 38 | ||
| 39 | unsigned int x86_family(unsigned int sig); | ||
| 40 | unsigned int x86_model(unsigned int sig); | ||
| 41 | unsigned int x86_stepping(unsigned int sig); | ||
| 39 | #endif /* _ASM_X86_CPU_H */ | 42 | #endif /* _ASM_X86_CPU_H */ |