Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc7' into tracing/core

This commit is contained in:
Ingo Molnar
2009-03-04 11:14:47 +01:00
126 changed files with 1154 additions and 552 deletions

View File

@@ -2303,9 +2303,13 @@ extern long sched_group_rt_runtime(struct task_group *tg);
extern int sched_group_set_rt_period(struct task_group *tg,
long rt_period_us);
extern long sched_group_rt_period(struct task_group *tg);
extern int sched_rt_can_attach(struct task_group *tg, struct task_struct *tsk);
#endif
#endif
extern int task_can_switch_user(struct user_struct *up,
struct task_struct *tsk);
#ifdef CONFIG_TASK_XACCT
static inline void add_rchar(struct task_struct *tsk, ssize_t amt)
{