diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 10:51:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 10:51:57 -0400 |
| commit | 7f79d852ed30a06eebf7497afe9334a726db3d40 (patch) | |
| tree | 0057281f17501b635d3d88cda9a14203706f5dcc /include/linux/sched.h | |
| parent | aef745fca016aea45adae5c98e8698904dd8ad51 (diff) | |
| parent | 70bb08962ea9bd50797ae9f16b2493f5f7c65053 (diff) | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 08a87b5f29e1..b3b7a8f32477 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -1475,6 +1475,10 @@ static inline void put_task_struct(struct task_struct *t) | |||
| 1475 | __put_task_struct(t); | 1475 | __put_task_struct(t); |
| 1476 | } | 1476 | } |
| 1477 | 1477 | ||
| 1478 | extern cputime_t task_utime(struct task_struct *p); | ||
| 1479 | extern cputime_t task_stime(struct task_struct *p); | ||
| 1480 | extern cputime_t task_gtime(struct task_struct *p); | ||
| 1481 | |||
| 1478 | /* | 1482 | /* |
| 1479 | * Per process flags | 1483 | * Per process flags |
| 1480 | */ | 1484 | */ |