diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-12 07:48:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-12 07:48:57 -0500 |
| commit | 45ab6b0c76d0e4cce5bd608ccf97b0f6b20f18df (patch) | |
| tree | 4d51c73533c386aee16fde1e74b5e3bc22eedc53 /include/linux/sched.h | |
| parent | 81444a799550214f549caf579cf65a0ca55e70b7 (diff) | |
| parent | d65bd5ecb2bd166cea4952a59b7e16cc3ad6ef6c (diff) | |
Merge branch 'sched/core' into cpus4096
Conflicts:
include/linux/ftrace.h
kernel/sched.c
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 423830b6e6e9..4240f6bfa812 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -2265,6 +2265,7 @@ extern void normalize_rt_tasks(void); | |||
| 2265 | extern struct task_group init_task_group; | 2265 | extern struct task_group init_task_group; |
| 2266 | #ifdef CONFIG_USER_SCHED | 2266 | #ifdef CONFIG_USER_SCHED |
| 2267 | extern struct task_group root_task_group; | 2267 | extern struct task_group root_task_group; |
| 2268 | extern void set_tg_uid(struct user_struct *user); | ||
| 2268 | #endif | 2269 | #endif |
| 2269 | 2270 | ||
| 2270 | extern struct task_group *sched_create_group(struct task_group *parent); | 2271 | extern struct task_group *sched_create_group(struct task_group *parent); |