diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-17 20:50:37 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-17 20:50:37 +1100 |
| commit | 8aace6d2b25a1e9dd44d46ad053d97f8c4944455 (patch) | |
| tree | 0f2e49350d6cfaaeeee17e86e2c55ea36e92c994 /include | |
| parent | fae7940336413d53e217fa9d7b659679552fc2d3 (diff) | |
| parent | cb7a571b4a340933645567428c0bb47544e4926d (diff) | |
Merge commit 'cputime/cputime'
Conflicts:
kernel/sched.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/kernel_stat.h | 13 | ||||
| -rw-r--r-- | include/linux/sched.h | 1 |
2 files changed, 8 insertions, 6 deletions
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h index 4ee4b3d2316f..570d20413119 100644 --- a/include/linux/kernel_stat.h +++ b/include/linux/kernel_stat.h @@ -79,10 +79,13 @@ static inline unsigned int kstat_irqs(unsigned int irq) } extern unsigned long long task_delta_exec(struct task_struct *); -extern void account_user_time(struct task_struct *, cputime_t); -extern void account_user_time_scaled(struct task_struct *, cputime_t); -extern void account_system_time(struct task_struct *, int, cputime_t); -extern void account_system_time_scaled(struct task_struct *, cputime_t); -extern void account_steal_time(struct task_struct *, cputime_t); +extern void account_user_time(struct task_struct *, cputime_t, cputime_t); +extern void account_system_time(struct task_struct *, int, cputime_t, cputime_t); +extern void account_steal_time(cputime_t); +extern void account_idle_time(cputime_t); + +extern void account_process_tick(struct task_struct *, int user); +extern void account_steal_ticks(unsigned long ticks); +extern void account_idle_ticks(unsigned long ticks); #endif /* _LINUX_KERNEL_STAT_H */ diff --git a/include/linux/sched.h b/include/linux/sched.h index 473500020293..d21578f9de66 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -284,7 +284,6 @@ long io_schedule_timeout(long timeout); extern void cpu_init (void); extern void trap_init(void); -extern void account_process_tick(struct task_struct *task, int user); extern void update_process_times(int user); extern void scheduler_tick(void); |