Merge branch 'linus' into sched/devel

This commit is contained in:
Ingo Molnar
2008-09-06 16:51:57 +02:00
835 changed files with 32213 additions and 9250 deletions

View File

@@ -1475,6 +1475,10 @@ static inline void put_task_struct(struct task_struct *t)
__put_task_struct(t);
}
extern cputime_t task_utime(struct task_struct *p);
extern cputime_t task_stime(struct task_struct *p);
extern cputime_t task_gtime(struct task_struct *p);
/*
* Per process flags
*/