diff options
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 8 |
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, | |||
2180 | if (task_running(rq, p)) | 2180 | if (task_running(rq, p)) |
2181 | return 0; | 2181 | return 0; |
2182 | 2182 | ||
2183 | /* | ||
2184 | * Aggressive migration if too many balance attempts have failed: | ||
2185 | */ | ||
2186 | if (sd->nr_balance_failed > sd->cache_nice_tries) | ||
2187 | return 1; | ||
2188 | |||
2189 | return 1; | 2183 | return 1; |
2190 | } | 2184 | } |
2191 | 2185 | ||
@@ -4923,7 +4917,7 @@ static inline void sched_init_granularity(void) | |||
4923 | if (sysctl_sched_granularity > gran_limit) | 4917 | if (sysctl_sched_granularity > gran_limit) |
4924 | sysctl_sched_granularity = gran_limit; | 4918 | sysctl_sched_granularity = gran_limit; |
4925 | 4919 | ||
4926 | sysctl_sched_runtime_limit = sysctl_sched_granularity * 8; | 4920 | sysctl_sched_runtime_limit = sysctl_sched_granularity * 5; |
4927 | sysctl_sched_wakeup_granularity = sysctl_sched_granularity / 2; | 4921 | sysctl_sched_wakeup_granularity = sysctl_sched_granularity / 2; |
4928 | } | 4922 | } |
4929 | 4923 | ||