Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: Fix/clarify set_task_cpu() locking rules
  lockdep: Fix lock_is_held() on recursion
  sched: Fix schedstat.nr_wakeups_migrate
  sched: Fix cross-cpu clock sync on remote wakeups

diff --combined include/linux/sched.h
index 2a8621c4be1e36d6e713f1b30e51cc607f8b4e02,483c1ed5bc4d934016cb60ee0e2565a7d6589c33..a837b20ba190330c23b59ec5a3fb584fc9f6308f
--- 1/include/linux/sched.h
--- 2/include/linux/sched.h
+++ b/include/linux/sched.h
@@@ -1063,6 -1063,7 +1063,7 @@@ struct sched_domain
   */
  #define WF_SYNC               0x01            /* waker goes to sleep after wakup */
  #define WF_FORK               0x02            /* child wakeup after fork */
+ #define WF_MIGRATED   0x04            /* internal use, task got migrated */
  
  #define ENQUEUE_WAKEUP                1
  #define ENQUEUE_HEAD          2
@@@ -1546,7 -1547,7 +1547,7 @@@ struct task_struct 
  #ifdef CONFIG_TRACING
        /* state flags for use by tracers */
        unsigned long trace;
 -      /* bitmask of trace recursion */
 +      /* bitmask and counter of trace recursion */
        unsigned long trace_recursion;
  #endif /* CONFIG_TRACING */
  #ifdef CONFIG_CGROUP_MEM_RES_CTLR /* memcg uses this to do batch job */
@@@ -2194,6 -2195,7 +2195,6 @@@ static inline void mmdrop(struct mm_str
        if (unlikely(atomic_dec_and_test(&mm->mm_count)))
                __mmdrop(mm);
  }
 -extern int mm_init_cpumask(struct mm_struct *mm, struct mm_struct *oldmm);
  
  /* mmput gets rid of the mappings and all user-space */
  extern void mmput(struct mm_struct *);