diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-31 22:09:51 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-31 22:09:51 +0300 |
| commit | 42595ce90b9d4a6b9d8c5a1ea78da4eeaf7e086a (patch) | |
| tree | adb5dda1bd278e920c2e680c24fb84d7c7c67cc8 /Documentation | |
| parent | d9d76778927dc953c553b83ab52287dfbd15ac6a (diff) | |
| parent | 8fefe9dacdb0a1347d3dac871bb1bba3cbc32945 (diff) | |
| download | linux-42595ce90b9d4a6b9d8c5a1ea78da4eeaf7e086a.tar.xz | |
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 'Documentation')
| -rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index cbd8bc7cf21d..24799f1d29fe 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3201,7 +3201,7 @@ [X86,PV_OPS] Disable paravirtualized VMware scheduler clock and use the default one. - no-steal-acc [X86,KVM,ARM64] Disable paravirtualized steal time + no-steal-acc [X86,PV_OPS,ARM64] Disable paravirtualized steal time accounting. steal time is computed, but won't influence scheduler behaviour |