Merge branch 'sched/core' into cpus4096
Conflicts: include/linux/ftrace.h kernel/sched.c
This commit is contained in:
commit
45ab6b0c76
166 changed files with 3020 additions and 1777 deletions
|
@ -2265,6 +2265,7 @@ extern void normalize_rt_tasks(void);
|
|||
extern struct task_group init_task_group;
|
||||
#ifdef CONFIG_USER_SCHED
|
||||
extern struct task_group root_task_group;
|
||||
extern void set_tg_uid(struct user_struct *user);
|
||||
#endif
|
||||
|
||||
extern struct task_group *sched_create_group(struct task_group *parent);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue