diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-02-21 15:12:04 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-02-21 15:12:04 -0500 |
| commit | fe7ef49a026fada706d93f504d368ebd0c0ef17b (patch) | |
| tree | 51b54dc52e1cbecc944e9738de65608960f84db5 /arch/x86/kvm/x86.c | |
| parent | ba9c4b4d0b1a45b83b40eb1b8fa3d9d1be32fd97 (diff) | |
| parent | 1569265782ef26ed77ce45ebeb0676f11d4c114a (diff) | |
Merge tag 'v3.10.29' into v3.10-rt
This is the 3.10.29 stable release
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 96816ee47d1a..c70ea56010d8 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -94,6 +94,9 @@ EXPORT_SYMBOL_GPL(kvm_x86_ops); static bool ignore_msrs = 0; module_param(ignore_msrs, bool, S_IRUGO | S_IWUSR); +unsigned int min_timer_period_us = 500; +module_param(min_timer_period_us, uint, S_IRUGO | S_IWUSR); + bool kvm_has_tsc_control; EXPORT_SYMBOL_GPL(kvm_has_tsc_control); u32 kvm_max_guest_tsc_khz; |