Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[deliverable/linux.git] / include / linux / sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 078066daffd486d426027e9c97c3a40b8202e950..ce1e1c0aaa337fab9dda6de7f8f6d7529ca8a270 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -107,14 +107,6 @@ extern unsigned long this_cpu_load(void);
 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);
@@ -1034,6 +1026,9 @@ struct task_struct {
 #ifdef CONFIG_SMP
        struct llist_node wake_entry;
        int on_cpu;
+       struct task_struct *last_wakee;
+       unsigned long wakee_flips;
+       unsigned long wakee_flip_decay_ts;
 #endif
        int on_rq;