diff --git a/[refs] b/[refs] index d14e29df6099..b0543615488c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 498657a478c60be092208422fefa9c7b248729c2 +refs/heads/master: 047106adcc85e3023da210143a6ab8a55df9e0fc diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index cea2beac7909..3c91f110fc62 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -7912,6 +7912,8 @@ sd_parent_degenerate(struct sched_domain *sd, struct sched_domain *parent) static void free_rootdomain(struct root_domain *rd) { + synchronize_sched(); + cpupri_cleanup(&rd->cpupri); free_cpumask_var(rd->rto_mask);