diff options
Diffstat (limited to 'include/linux/kernel_stat.h')
-rw-r--r-- | include/linux/kernel_stat.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h index 00f776816aa3..66be8b6beceb 100644 --- a/include/linux/kernel_stat.h +++ b/include/linux/kernel_stat.h | |||
@@ -9,7 +9,6 @@ | |||
9 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
10 | #include <linux/vtime.h> | 10 | #include <linux/vtime.h> |
11 | #include <asm/irq.h> | 11 | #include <asm/irq.h> |
12 | #include <linux/cputime.h> | ||
13 | 12 | ||
14 | /* | 13 | /* |
15 | * 'kernel_stat.h' contains the definitions needed for doing | 14 | * 'kernel_stat.h' contains the definitions needed for doing |
@@ -78,15 +77,18 @@ static inline unsigned int kstat_cpu_irqs_sum(unsigned int cpu) | |||
78 | return kstat_cpu(cpu).irqs_sum; | 77 | return kstat_cpu(cpu).irqs_sum; |
79 | } | 78 | } |
80 | 79 | ||
81 | extern void account_user_time(struct task_struct *, cputime_t); | 80 | extern void account_user_time(struct task_struct *, u64); |
82 | extern void account_system_time(struct task_struct *, int, cputime_t); | 81 | extern void account_guest_time(struct task_struct *, u64); |
83 | extern void account_steal_time(cputime_t); | 82 | extern void account_system_time(struct task_struct *, int, u64); |
84 | extern void account_idle_time(cputime_t); | 83 | extern void account_system_index_time(struct task_struct *, u64, |
84 | enum cpu_usage_stat); | ||
85 | extern void account_steal_time(u64); | ||
86 | extern void account_idle_time(u64); | ||
85 | 87 | ||
86 | #ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE | 88 | #ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE |
87 | static inline void account_process_tick(struct task_struct *tsk, int user) | 89 | static inline void account_process_tick(struct task_struct *tsk, int user) |
88 | { | 90 | { |
89 | vtime_account_user(tsk); | 91 | vtime_flush(tsk); |
90 | } | 92 | } |
91 | #else | 93 | #else |
92 | extern void account_process_tick(struct task_struct *, int user); | 94 | extern void account_process_tick(struct task_struct *, int user); |