diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-20 08:15:13 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-20 08:15:13 -1000 |
| commit | 4db88eb4c300333ed37585f75ab9a664ec537d68 (patch) | |
| tree | 08b65728c54965970d711131dd83077ebb97b407 /include/linux/vtime.h | |
| parent | 53d5defcfa8c9603554a3174cbe206fb69f6e8ef (diff) | |
| parent | f5d00c1f9adb350c24c5301600f7bf2da99b66de (diff) | |
| download | linux-3.10-4db88eb4c300333ed37585f75ab9a664ec537d68.tar.gz linux-3.10-4db88eb4c300333ed37585f75ab9a664ec537d68.tar.bz2 linux-3.10-4db88eb4c300333ed37585f75ab9a664ec537d68.zip | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
- Fix inconstinant clock usage in virtual time accounting
- Fix a build error in KVM caused by the NOHZ work
- Remove a pointless timekeeping duty assignment which breaks NOHZ
- Use a proper notifier return value to avoid random behaviour
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
tick: Remove useless timekeeping duty attribution to broadcast source
nohz: Fix notifier return val that enforce timekeeping
kvm: Move guest entry/exit APIs to context_tracking
vtime: Use consistent clocks among nohz accounting
Diffstat (limited to 'include/linux/vtime.h')
| -rw-r--r-- | include/linux/vtime.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/vtime.h b/include/linux/vtime.h index 71a5782d8c5..b1dd2db8007 100644 --- a/include/linux/vtime.h +++ b/include/linux/vtime.h @@ -34,7 +34,7 @@ static inline void vtime_user_exit(struct task_struct *tsk) } extern void vtime_guest_enter(struct task_struct *tsk); extern void vtime_guest_exit(struct task_struct *tsk); -extern void vtime_init_idle(struct task_struct *tsk); +extern void vtime_init_idle(struct task_struct *tsk, int cpu); #else static inline void vtime_account_irq_exit(struct task_struct *tsk) { @@ -45,7 +45,7 @@ static inline void vtime_user_enter(struct task_struct *tsk) { } static inline void vtime_user_exit(struct task_struct *tsk) { } static inline void vtime_guest_enter(struct task_struct *tsk) { } static inline void vtime_guest_exit(struct task_struct *tsk) { } -static inline void vtime_init_idle(struct task_struct *tsk) { } +static inline void vtime_init_idle(struct task_struct *tsk, int cpu) { } #endif #ifdef CONFIG_IRQ_TIME_ACCOUNTING |