diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 02:10:07 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 02:10:07 -0400 |
| commit | e14eee56c2280953c6e3d24d5dce42bd90836b81 (patch) | |
| tree | 21ab792d9ad6fbbab460058f352a0158f995644e /include/linux/sched.h | |
| parent | d6ee6f7e4c74d9a0fed7544f4d389bde004651d3 (diff) | |
| parent | 99adcd9d67aaf04e28f5ae96df280f236bde4b66 (diff) | |
Merge commit 'origin/master' into next
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 8981e52c714f..8c216e057c94 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -2291,9 +2291,13 @@ extern long sched_group_rt_runtime(struct task_group *tg); | |||
| 2291 | extern int sched_group_set_rt_period(struct task_group *tg, | 2291 | extern int sched_group_set_rt_period(struct task_group *tg, |
| 2292 | long rt_period_us); | 2292 | long rt_period_us); |
| 2293 | extern long sched_group_rt_period(struct task_group *tg); | 2293 | extern long sched_group_rt_period(struct task_group *tg); |
| 2294 | extern int sched_rt_can_attach(struct task_group *tg, struct task_struct *tsk); | ||
| 2294 | #endif | 2295 | #endif |
| 2295 | #endif | 2296 | #endif |
| 2296 | 2297 | ||
| 2298 | extern int task_can_switch_user(struct user_struct *up, | ||
| 2299 | struct task_struct *tsk); | ||
| 2300 | |||
| 2297 | #ifdef CONFIG_TASK_XACCT | 2301 | #ifdef CONFIG_TASK_XACCT |
| 2298 | static inline void add_rchar(struct task_struct *tsk, ssize_t amt) | 2302 | static inline void add_rchar(struct task_struct *tsk, ssize_t amt) |
| 2299 | { | 2303 | { |