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:
  cpuset: Fix cpuset_cpus_allowed_fallback(), don't update tsk->rt.nr_cpus_allowed
  sched: Fix ->min_vruntime calculation in dequeue_entity()
  sched: Fix ttwu() for __ARCH_WANT_INTERRUPTS_ON_CTXSW
  sched: More sched_domain iterations fixes

diff --combined include/linux/sched.h
index 8f441d1c6550c2a9142dbfbe17c39a7d75187013,8da84b7bc1b87e9127ec640c674c06ea57aa7f16..bcddd01381050852b856b3144bdc054f0c79204a
--- 1/include/linux/sched.h
--- 2/include/linux/sched.h
+++ b/include/linux/sched.h
@@@ -1546,7 -1546,7 +1546,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 */
@@@ -1841,9 -1841,16 +1841,16 @@@ static inline void rcu_copy_process(str
  #endif
  
  #ifdef CONFIG_SMP
+ extern void do_set_cpus_allowed(struct task_struct *p,
+                              const struct cpumask *new_mask);
+ 
  extern int set_cpus_allowed_ptr(struct task_struct *p,
                                const struct cpumask *new_mask);
  #else
+ static inline void do_set_cpus_allowed(struct task_struct *p,
+                                     const struct cpumask *new_mask)
+ {
+ }
  static inline int set_cpus_allowed_ptr(struct task_struct *p,
                                       const struct cpumask *new_mask)
  {