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

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: revert recent sync wakeup changes

diff --combined kernel/sched.c
index e72485033c48e0317a22d376e2c290440b40cce9,f11c02b86c73e093f5cf306e8f9b7f5bbce6d7bb..c1d0ed360088f5a5378ae4b6db9555e7e0b90f21
--- 1/kernel/sched.c
--- 2/kernel/sched.c
+++ b/kernel/sched.c
@@@ -2266,16 -2266,6 +2266,6 @@@ static int try_to_wake_up(struct task_s
        if (!sched_feat(SYNC_WAKEUPS))
                sync = 0;
  
-       if (!sync) {
-               if (current->se.avg_overlap < sysctl_sched_migration_cost &&
-                         p->se.avg_overlap < sysctl_sched_migration_cost)
-                       sync = 1;
-       } else {
-               if (current->se.avg_overlap >= sysctl_sched_migration_cost ||
-                         p->se.avg_overlap >= sysctl_sched_migration_cost)
-                       sync = 0;
-       }
- 
  #ifdef CONFIG_SMP
        if (sched_feat(LB_WAKEUP_UPDATE)) {
                struct sched_domain *sd;
@@@ -4702,8 -4692,8 +4692,8 @@@ EXPORT_SYMBOL(default_wake_function)
   * started to run but is not in state TASK_RUNNING. try_to_wake_up() returns
   * zero in this (rare) case, and we handle it by continuing to scan the queue.
   */
 -static void __wake_up_common(wait_queue_head_t *q, unsigned int mode,
 -                           int nr_exclusive, int sync, void *key)
 +void __wake_up_common(wait_queue_head_t *q, unsigned int mode,
 +                      int nr_exclusive, int sync, void *key)
  {
        wait_queue_t *curr, *next;