diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-04 05:14:47 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-04 05:14:47 -0500 |
| commit | a1be621dfacbef0fd374d8acd553d71e07bf29ac (patch) | |
| tree | 32b0355454b43b1098b5e01dd699fd7281abf781 /include/linux/sched.h | |
| parent | 3612fdf780e28b10323dd12d2b0f306c7ada4d4c (diff) | |
| parent | fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff) | |
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc7' into tracing/core
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 7702cb166e08..698ce978e97a 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -2303,9 +2303,13 @@ extern long sched_group_rt_runtime(struct task_group *tg); | |||
| 2303 | extern int sched_group_set_rt_period(struct task_group *tg, | 2303 | extern int sched_group_set_rt_period(struct task_group *tg, |
| 2304 | long rt_period_us); | 2304 | long rt_period_us); |
| 2305 | extern long sched_group_rt_period(struct task_group *tg); | 2305 | extern long sched_group_rt_period(struct task_group *tg); |
| 2306 | extern int sched_rt_can_attach(struct task_group *tg, struct task_struct *tsk); | ||
| 2306 | #endif | 2307 | #endif |
| 2307 | #endif | 2308 | #endif |
| 2308 | 2309 | ||
| 2310 | extern int task_can_switch_user(struct user_struct *up, | ||
| 2311 | struct task_struct *tsk); | ||
| 2312 | |||
| 2309 | #ifdef CONFIG_TASK_XACCT | 2313 | #ifdef CONFIG_TASK_XACCT |
| 2310 | static inline void add_rchar(struct task_struct *tsk, ssize_t amt) | 2314 | static inline void add_rchar(struct task_struct *tsk, ssize_t amt) |
| 2311 | { | 2315 | { |