Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
  sched: fix startup penalty calculation
  sched: simplify bonus calculation #2
  sched: simplify bonus calculation #1
  sched: tidy up and simplify the bonus balance
  sched: optimize task_tick_rt() a bit
  sched: simplify can_migrate_task()
  sched: remove HZ dependency from the granularity default
  sched: CONFIG_SCHED_GROUP_FAIR=y fixlet

1 files changed, 1 insertions, 7 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index 96e9b82246d2..6798328a2e0e 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2180,12 +2180,6 @@ int can_migrate_task(struct task_struct *p, struct rq *rq, int this_cpu,
         if (task_running(rq, p))
                 return 0;
 
-        /*
-         * Aggressive migration if too many balance attempts have failed:
-         */
-        if (sd->nr_balance_failed > sd->cache_nice_tries)
-                return 1;
-
         return 1;
 }
 
@@ -4923,7 +4917,7 @@ static inline void sched_init_granularity(void)
         if (sysctl_sched_granularity > gran_limit)
                 sysctl_sched_granularity = gran_limit;
 
-        sysctl_sched_runtime_limit = sysctl_sched_granularity * 8;
+        sysctl_sched_runtime_limit = sysctl_sched_granularity * 5;
         sysctl_sched_wakeup_granularity = sysctl_sched_granularity / 2;
 }