diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-12-08 15:44:43 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-12-08 15:44:43 +0100 |
| commit | 38130ec08716ae2ece8060eca01607b58da7258c (patch) | |
| tree | 71d0cd76ccfb2b960ddb6b820850269265389052 /include/linux/kvm_host.h | |
| parent | e783377e93d4043a11013ce6e9173db34998e653 (diff) | |
| parent | 1b2852b152be5150fbef7b585388ec43cf6f4415 (diff) | |
| download | linux-3.10-38130ec08716ae2ece8060eca01607b58da7258c.tar.gz linux-3.10-38130ec08716ae2ece8060eca01607b58da7258c.tar.bz2 linux-3.10-38130ec08716ae2ece8060eca01607b58da7258c.zip | |
Merge tag 'sched-cputime-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into sched/core
Pull more cputime cleanups from Frederic Weisbecker:
* Get rid of underscores polluting the vtime namespace
* Consolidate context switch and tick handling
* Improve debuggability by detecting irq unsafe callers
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 3738c260dde..d5cddd8dcc5 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -730,7 +730,7 @@ static inline void kvm_guest_enter(void) * This is running in ioctl context so we can avoid * the call to vtime_account() with its unnecessary idle check. */ - vtime_account_system(current); + vtime_account_system_irqsafe(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 @@ -748,7 +748,7 @@ static inline void kvm_guest_exit(void) * This is running in ioctl context so we can avoid * the call to vtime_account() with its unnecessary idle check. */ - vtime_account_system(current); + vtime_account_system_irqsafe(current); current->flags &= ~PF_VCPU; } |