diff --git a/[refs] b/[refs] index 76b1e117375a..5323294be157 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 345227d705f2318e9bc088e79fe71a38bb5fe82b +refs/heads/master: 2abae55f5a41d29f21b5b259c33d218c950d5c90 diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index d646b279c8bb..0316f6eece03 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -3940,6 +3940,11 @@ static void cfq_exit_queue(struct elevator_queue *e) */ if (wait) synchronize_rcu(); + +#ifdef CONFIG_CFQ_GROUP_IOSCHED + /* Free up per cpu stats for root group */ + free_percpu(cfqd->root_group.blkg.stats_cpu); +#endif kfree(cfqd); }