Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

[karo-tx-linux.git] / include / linux / kvm_host.h

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 0ca3663206f8191e725d4a8f2b1502dbbf18fbd7..ef78153cb36b07783fb31194b9b41ae1453078f3 100644 (file)
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -738,7 +738,7 @@ static inline int kvm_deassign_device(struct kvm *kvm,
 static inline void kvm_guest_enter(void)
 {
        BUG_ON(preemptible());
-       account_system_vtime(current);
+       vtime_account(current);
        current->flags |= PF_VCPU;
        /* KVM does not hold any references to rcu protected data when it
         * switches CPU into a guest mode. In fact switching to a guest mode
@@ -752,7 +752,7 @@ static inline void kvm_guest_enter(void)
 
 static inline void kvm_guest_exit(void)
 {
-       account_system_vtime(current);
+       vtime_account(current);
        current->flags &= ~PF_VCPU;
 }