From 242b4d142393831b59f29575a75d1e3dfd1ef82b Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Fri, 11 May 2012 00:26:27 +0200 Subject: [PATCH] --- yaml --- r: 305002 b: refs/heads/master c: 870a0bb5d636156502769233d02a0d5791d4366a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched/core.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 4707cdb8b2d9..bf8703649f0c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04f733b4afac5dc93ae9b0a8703c60b87def491e +refs/heads/master: 870a0bb5d636156502769233d02a0d5791d4366a diff --git a/trunk/kernel/sched/core.c b/trunk/kernel/sched/core.c index 24922b7ff567..6883d998dc38 100644 --- a/trunk/kernel/sched/core.c +++ b/trunk/kernel/sched/core.c @@ -6261,11 +6261,6 @@ static int *sched_domains_numa_distance; static struct cpumask ***sched_domains_numa_masks; static int sched_domains_curr_level; -static inline unsigned long numa_scale(unsigned long x, int level) -{ - return x * sched_domains_numa_distance[level] / sched_domains_numa_scale; -} - static inline int sd_local_flags(int level) { if (sched_domains_numa_distance[level] > REMOTE_DISTANCE) @@ -6286,7 +6281,7 @@ sd_numa_init(struct sched_domain_topology_level *tl, int cpu) .min_interval = sd_weight, .max_interval = 2*sd_weight, .busy_factor = 32, - .imbalance_pct = 100 + numa_scale(25, level), + .imbalance_pct = 125, .cache_nice_tries = 2, .busy_idx = 3, .idle_idx = 2,