diff options
| author | Greg Kroah-Hartman <[email protected]> | 2015-05-08 14:38:55 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2015-05-08 14:38:55 +0200 |
| commit | b4da00601edd39184fa187d5fd6dfc36232991cc (patch) | |
| tree | f58bafde4efd814bb78b4f531b1eab48dcf8e561 /include/linux/sched.h | |
| parent | d5a7d45fb5b667fd10a225ccf11fe395fb2417d9 (diff) | |
| parent | 5ebe6afaf0057ac3eaeb98defd5456894b446d22 (diff) | |
Merge 4.1-rc2 into staging-next
We want the fixes in here to make merges and testing easier.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 8222ae40ecb0..26a2e6122734 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -175,14 +175,6 @@ extern void get_iowait_load(unsigned long *nr_waiters, unsigned long *load); extern void calc_global_load(unsigned long ticks); extern void update_cpu_load_nohz(void); -/* Notifier for when a task gets migrated to a new CPU */ -struct task_migration_notifier { - struct task_struct *task; - int from_cpu; - int to_cpu; -}; -extern void register_task_migration_notifier(struct notifier_block *n); - extern unsigned long get_parent_ip(unsigned long addr); extern void dump_cpu_task(int cpu); |