summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2017-11-28 13:59:25 +0100
committerTejun Heo <tj@kernel.org>2017-11-28 07:16:08 -0800
commit52cf373c37a684f8fc279d541307fad39d206376 (patch)
tree27b35f9e9d446388dd018f583f8bf080774875f3 /kernel
parentddf7005f32212f28669032651e09bd8d2245c35d (diff)
downloadlinux-stable-52cf373c37a684f8fc279d541307fad39d206376.tar.gz
linux-stable-52cf373c37a684f8fc279d541307fad39d206376.tar.bz2
linux-stable-52cf373c37a684f8fc279d541307fad39d206376.zip
cgroup: properly init u64_stats
Lockdep complains that the stats update is trying to register a non-static key. This is because u64_stats are using a seqlock on 32bit arches, which needs to be initialized before usage. Fixes: 041cd640b2f3 (cgroup: Implement cgroup2 basic CPU usage accounting) Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cgroup/stat.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/cgroup/stat.c b/kernel/cgroup/stat.c
index 133b465691d6..1e111dd455c4 100644
--- a/kernel/cgroup/stat.c
+++ b/kernel/cgroup/stat.c
@@ -296,8 +296,12 @@ int cgroup_stat_init(struct cgroup *cgrp)
}
/* ->updated_children list is self terminated */
- for_each_possible_cpu(cpu)
- cgroup_cpu_stat(cgrp, cpu)->updated_children = cgrp;
+ for_each_possible_cpu(cpu) {
+ struct cgroup_cpu_stat *cstat = cgroup_cpu_stat(cgrp, cpu);
+
+ cstat->updated_children = cgrp;
+ u64_stats_init(&cstat->sync);
+ }
prev_cputime_init(&cgrp->stat.prev_cputime);