lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'v2.6.29-rc7' into perfcounters/core

Browse Source 
Conflicts:
	arch/x86/mm/iomap_32.c
This commit is contained in:
Ingo Molnar
2009-03-04 11:42:31 +01:00
parent a1ef58f442 fec6c6fec3
commit 8163d88c79
268 changed files with 3032 additions and 1639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/sched.h
View File

@@ -2308,9 +2308,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)
{