diff options
author | Frederic Weisbecker <fweisbec@gmail.com> | 2012-11-13 12:21:22 -0500 |
---|---|---|
committer | Frederic Weisbecker <fweisbec@gmail.com> | 2012-11-19 10:40:16 -0500 |
commit | fd25b4c2f226de818e1d2b71e3e681d28bcaf5ba (patch) | |
tree | dd1ce241709d2363e0d8b2c853f51dc5c897805c /include/linux/kvm_host.h | |
parent | 38ca9c927c7d3db61f57e3d3a9334958c3af6e9a (diff) |
vtime: Remove the underscore prefix invasion
Prepending irq-unsafe vtime APIs with underscores was actually
a bad idea as the result is a big mess in the API namespace that
is even waiting to be further extended. Also these helpers
are always called from irq safe callers except kvm. Just
provide a vtime_account_system_irqsafe() for this specific
case so that we can remove the underscore prefix on other
vtime functions.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Reviewed-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'include/linux/kvm_host.h')
-rw-r--r-- | include/linux/kvm_host.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 0e2212fe4784..f17158bdd4fc 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h | |||
@@ -741,7 +741,7 @@ static inline void kvm_guest_enter(void) | |||
741 | * This is running in ioctl context so we can avoid | 741 | * This is running in ioctl context so we can avoid |
742 | * the call to vtime_account() with its unnecessary idle check. | 742 | * the call to vtime_account() with its unnecessary idle check. |
743 | */ | 743 | */ |
744 | vtime_account_system(current); | 744 | vtime_account_system_irqsafe(current); |
745 | current->flags |= PF_VCPU; | 745 | current->flags |= PF_VCPU; |
746 | /* KVM does not hold any references to rcu protected data when it | 746 | /* KVM does not hold any references to rcu protected data when it |
747 | * switches CPU into a guest mode. In fact switching to a guest mode | 747 | * switches CPU into a guest mode. In fact switching to a guest mode |
@@ -759,7 +759,7 @@ static inline void kvm_guest_exit(void) | |||
759 | * This is running in ioctl context so we can avoid | 759 | * This is running in ioctl context so we can avoid |
760 | * the call to vtime_account() with its unnecessary idle check. | 760 | * the call to vtime_account() with its unnecessary idle check. |
761 | */ | 761 | */ |
762 | vtime_account_system(current); | 762 | vtime_account_system_irqsafe(current); |
763 | current->flags &= ~PF_VCPU; | 763 | current->flags &= ~PF_VCPU; |
764 | } | 764 | } |
765 | 765 | ||