diff --git a/[refs] b/[refs] index c80d7c435768..47608c12ae15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1673ad52bd9a3c747e596a76e65c55981ea651e3 +refs/heads/master: 91cd4d6ef0abb1f65e81f8fe37e7d3c10344e38c diff --git a/trunk/kernel/cpuset.c b/trunk/kernel/cpuset.c index 459d601947a8..d2cc67dac8b1 100644 --- a/trunk/kernel/cpuset.c +++ b/trunk/kernel/cpuset.c @@ -679,7 +679,9 @@ static void rebuild_sched_domains(void) if (apn == b->pn) { cpus_or(*dp, *dp, b->cpus_allowed); b->pn = -1; - update_domain_attr(dattr, b); + if (dattr) + update_domain_attr(dattr + + nslot, b); } } nslot++;