From 6a3152e831afc1de128c75647d7e9e37a3bce937 Mon Sep 17 00:00:00 2001
From: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Thu, 18 Oct 2007 14:39:10 +0200
Subject: [PATCH] --- yaml --- r: 80671 b: refs/heads/master c:
 e56a7a28e21aa2d1af659d8f38952411ce9ae40e h: refs/heads/master i:   80669:
 46cd02a74787267091fd24b653478c9289659bb3   80667:
 edf7958d501fd9bce1f61bfa940cd52dfe1e9904   80663:
 a40ee00989679411dfe6d7695a549582ae380fbf   80655:
 fedca51d2c61dae85d3b399f0c18392508cd1797   80639:
 4ec94ccb2de9dac565c2dade08a027ee7be0ad31 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/kvm/kvm.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9479fbcda543..8e62e9e2002f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a7ae055f3533b520401c170ac55e30628b34df5
+refs/heads/master: e56a7a28e21aa2d1af659d8f38952411ce9ae40e
diff --git a/trunk/drivers/kvm/kvm.h b/trunk/drivers/kvm/kvm.h
index df0711ce9baa..e8a21e8cb2ad 100644
--- a/trunk/drivers/kvm/kvm.h
+++ b/trunk/drivers/kvm/kvm.h
@@ -7,6 +7,7 @@
  */
 
 #include <linux/types.h>
+#include <linux/hardirq.h>
 #include <linux/list.h>
 #include <linux/mutex.h>
 #include <linux/spinlock.h>
@@ -671,11 +672,13 @@ __init void kvm_arch_init(void);
 
 static inline void kvm_guest_enter(void)
 {
+	account_system_vtime(current);
 	current->flags |= PF_VCPU;
 }
 
 static inline void kvm_guest_exit(void)
 {
+	account_system_vtime(current);
 	current->flags &= ~PF_VCPU;
 }