diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-14 10:37:48 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-14 10:37:48 +0200 |
| commit | cefef3a76287c9b51e946d312aea1637bb3a57ff (patch) | |
| tree | acc1ee1a6a530803951e3c0a0ca65c08a567f563 /arch/x86/kernel/kvm.c | |
| parent | 92d21ac74a9e3c09b0b01c764e530657e4c85c49 (diff) | |
| parent | 748c7201e622d1c24abb4f85072d2e74d12f295f (diff) | |
Merge branch 'sched/core' into timers/nohz, to avoid conflicts in upcoming patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/kvm.c')
| -rw-r--r-- | arch/x86/kernel/kvm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index eea2a6f72b31..1ef5e48b3a36 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -301,8 +301,6 @@ static void kvm_register_steal_time(void) if (!has_steal_clock) return; - memset(st, 0, sizeof(*st)); - wrmsrl(MSR_KVM_STEAL_TIME, (slow_virt_to_phys(st) | KVM_MSR_ENABLED)); pr_info("kvm-stealtime: cpu %d, msr %llx\n", cpu, (unsigned long long) slow_virt_to_phys(st)); |