diff options
author | Linus Torvalds | 2020-03-31 12:09:51 -0700 |
---|---|---|
committer | Linus Torvalds | 2020-03-31 12:09:51 -0700 |
commit | 42595ce90b9d4a6b9d8c5a1ea78da4eeaf7e086a (patch) | |
tree | adb5dda1bd278e920c2e680c24fb84d7c7c67cc8 /init | |
parent | d9d76778927dc953c553b83ab52287dfbd15ac6a (diff) | |
parent | 8fefe9dacdb0a1347d3dac871bb1bba3cbc32945 (diff) |
Merge branch 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 vmware updates from Ingo Molnar:
"The main change in this tree is the addition of 'steal time clock
support' for VMware guests"
* 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/vmware: Use bool type for vmw_sched_clock
x86/vmware: Enable steal time accounting
x86/vmware: Add steal time clock support for VMware guests
x86/vmware: Remove vmware_sched_clock_setup()
x86/vmware: Make vmware_select_hypercall() __init
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions