From 694f4b0f44f6149e2fe1150305012ee06d233336 Mon Sep 17 00:00:00 2001 From: Dimitri Sivanich Date: Tue, 5 Jun 2012 13:44:36 -0500 Subject: [PATCH] --- yaml --- r: 310641 b: refs/heads/master c: a841f8cef4bb124f0f5563314d0beaf2e1249d72 h: refs/heads/master i: 310639: e917ca779fad7e1c3a2d4c1f0992596fc68acf47 v: v3 --- [refs] | 2 +- trunk/kernel/sched/core.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 18328951d024..a9865f1707ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d039ac60800fe8ed8522ec3b9ca796aaf748c18b +refs/heads/master: a841f8cef4bb124f0f5563314d0beaf2e1249d72 diff --git a/trunk/kernel/sched/core.c b/trunk/kernel/sched/core.c index 2bdd17616437..d5594a4268d4 100644 --- a/trunk/kernel/sched/core.c +++ b/trunk/kernel/sched/core.c @@ -6268,11 +6268,8 @@ int sched_domain_level_max; static int __init setup_relax_domain_level(char *str) { - unsigned long val; - - val = simple_strtoul(str, NULL, 0); - if (val < sched_domain_level_max) - default_relax_domain_level = val; + if (kstrtoint(str, 0, &default_relax_domain_level)) + pr_warn("Unable to set relax_domain_level\n"); return 1; } @@ -6698,7 +6695,6 @@ struct sched_domain *build_sched_domain(struct sched_domain_topology_level *tl, if (!sd) return child; - set_domain_attribute(sd, attr); cpumask_and(sched_domain_span(sd), cpu_map, tl->mask(cpu)); if (child) { sd->level = child->level + 1; @@ -6706,6 +6702,7 @@ struct sched_domain *build_sched_domain(struct sched_domain_topology_level *tl, child->parent = sd; } sd->child = child; + set_domain_attribute(sd, attr); return sd; }