Commit 7943e15a authored by Li Zefan's avatar Li Zefan Committed by Ingo Molnar

sched/cpuacct: Allocate per_cpu cpuusage for root cpuacct statically

This is a preparation, so later we can initialize cpuacct
earlier.
Signed-off-by: default avatarLi Zefan <lizefan@huawei.com>
Cc: Tejun Heo <tj@kernel.org>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/51553822.5000403@huawei.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent d1712796
...@@ -58,6 +58,7 @@ static inline struct cpuacct *parent_ca(struct cpuacct *ca) ...@@ -58,6 +58,7 @@ static inline struct cpuacct *parent_ca(struct cpuacct *ca)
return cgroup_ca(ca->css.cgroup->parent); return cgroup_ca(ca->css.cgroup->parent);
} }
static DEFINE_PER_CPU(u64, root_cpuacct_cpuusage);
static struct cpuacct root_cpuacct; static struct cpuacct root_cpuacct;
/* create a new cpu accounting group */ /* create a new cpu accounting group */
...@@ -290,8 +291,7 @@ void cpuacct_account_field(struct task_struct *p, int index, u64 val) ...@@ -290,8 +291,7 @@ void cpuacct_account_field(struct task_struct *p, int index, u64 val)
void __init cpuacct_init(void) void __init cpuacct_init(void)
{ {
root_cpuacct.cpustat = &kernel_cpustat; root_cpuacct.cpustat = &kernel_cpustat;
root_cpuacct.cpuusage = alloc_percpu(u64); root_cpuacct.cpuusage = &root_cpuacct_cpuusage;
BUG_ON(!root_cpuacct.cpuusage); /* Too early, not expected to fail */
} }
struct cgroup_subsys cpuacct_subsys = { struct cgroup_subsys cpuacct_subsys = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment