diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-05-12 09:51:36 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-12 09:51:36 +0200 |
| commit | 4eb867651721228ee2eeae142c53378375303e8b (patch) | |
| tree | 43ebd9894ff53a7b2d0244293f226cbbfc80d882 /include/linux/sched.h | |
| parent | eb60b3e5e8dfdd590e586a6fc22daf2f63a7b7e6 (diff) | |
| parent | e5ef27d0f5acf9f1db2882d7546a41c021f66820 (diff) | |
| download | linux-4eb867651721228ee2eeae142c53378375303e8b.tar.gz linux-4eb867651721228ee2eeae142c53378375303e8b.tar.bz2 linux-4eb867651721228ee2eeae142c53378375303e8b.zip | |
Merge branch 'smp/hotplug' into sched/core, to resolve conflicts
Conflicts:
kernel/sched/core.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 57faf789c88f..f8fea8a5b5ab 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -374,6 +374,15 @@ extern void cpu_init (void); extern void trap_init(void); extern void update_process_times(int user); extern void scheduler_tick(void); +extern int sched_cpu_starting(unsigned int cpu); +extern int sched_cpu_activate(unsigned int cpu); +extern int sched_cpu_deactivate(unsigned int cpu); + +#ifdef CONFIG_HOTPLUG_CPU +extern int sched_cpu_dying(unsigned int cpu); +#else +# define sched_cpu_dying NULL +#endif extern void sched_show_task(struct task_struct *p); |