diff --git a/[refs] b/[refs] index 85de3b356f99..ac3a561ad57d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5393693e96393131a4a2e2743f883986d508503 +refs/heads/master: 93a6557558a13f9ff35213efeca483f353c39dd3 diff --git a/trunk/kernel/cpuset.c b/trunk/kernel/cpuset.c index c818c36b0c5f..7a82e9033a7f 100644 --- a/trunk/kernel/cpuset.c +++ b/trunk/kernel/cpuset.c @@ -616,7 +616,7 @@ void rebuild_sched_domains(void) dattr = kmalloc(sizeof(struct sched_domain_attr), GFP_KERNEL); if (dattr) { *dattr = SD_ATTR_INIT; - update_domain_attr(dattr, &top_cpuset); + update_domain_attr_tree(dattr, &top_cpuset); } *doms = top_cpuset.cpus_allowed; goto rebuild;