From a20dbd7e7198f5d2a52404c51f8c47e1a355da32 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizefan@huawei.com>
Date: Fri, 29 Mar 2013 14:44:04 +0800
Subject: [PATCH] --- yaml --- r: 366099 b: refs/heads/master c:
 14c6d3c8a47ced185b6375c4940b5b393f1a294e h: refs/heads/master i:   366097:
 769e9bcfa06cd0bd1c30bf0fba62712927bb3e37   366095:
 aad13fcbf34f894e6fba8edc85794efa67532e02 v: v3

---
 [refs]                       |  2 +-
 trunk/kernel/sched/core.c    |  2 --
 trunk/kernel/sched/cpuacct.c | 11 ++++-------
 trunk/kernel/sched/cpuacct.h |  5 -----
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index e53604166ac6..ccf73fef5407 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7943e15a3e91db78a7a3fbc84e45cf9d1c7c7d23
+refs/heads/master: 14c6d3c8a47ced185b6375c4940b5b393f1a294e
diff --git a/trunk/kernel/sched/core.c b/trunk/kernel/sched/core.c
index 92930a89529d..ee8c1bd703fe 100644
--- a/trunk/kernel/sched/core.c
+++ b/trunk/kernel/sched/core.c
@@ -6936,8 +6936,6 @@ void __init sched_init(void)
 
 #endif /* CONFIG_CGROUP_SCHED */
 
-	cpuacct_init();
-
 	for_each_possible_cpu(i) {
 		struct rq *rq;
 
diff --git a/trunk/kernel/sched/cpuacct.c b/trunk/kernel/sched/cpuacct.c
index a691c4dd65be..04255814a0ed 100644
--- a/trunk/kernel/sched/cpuacct.c
+++ b/trunk/kernel/sched/cpuacct.c
@@ -59,7 +59,10 @@ static inline struct cpuacct *parent_ca(struct cpuacct *ca)
 }
 
 static DEFINE_PER_CPU(u64, root_cpuacct_cpuusage);
-static struct cpuacct root_cpuacct;
+static struct cpuacct root_cpuacct = {
+	.cpustat	= &kernel_cpustat,
+	.cpuusage	= &root_cpuacct_cpuusage,
+};
 
 /* create a new cpu accounting group */
 static struct cgroup_subsys_state *cpuacct_css_alloc(struct cgroup *cgrp)
@@ -288,12 +291,6 @@ void cpuacct_account_field(struct task_struct *p, int index, u64 val)
 	rcu_read_unlock();
 }
 
-void __init cpuacct_init(void)
-{
-	root_cpuacct.cpustat = &kernel_cpustat;
-	root_cpuacct.cpuusage = &root_cpuacct_cpuusage;
-}
-
 struct cgroup_subsys cpuacct_subsys = {
 	.name = "cpuacct",
 	.css_alloc = cpuacct_css_alloc,
diff --git a/trunk/kernel/sched/cpuacct.h b/trunk/kernel/sched/cpuacct.h
index 51cd76eb4f0f..ed605624a5e7 100644
--- a/trunk/kernel/sched/cpuacct.h
+++ b/trunk/kernel/sched/cpuacct.h
@@ -1,15 +1,10 @@
 #ifdef CONFIG_CGROUP_CPUACCT
 
-extern void cpuacct_init(void);
 extern void cpuacct_charge(struct task_struct *tsk, u64 cputime);
 extern void cpuacct_account_field(struct task_struct *p, int index, u64 val);
 
 #else
 
-static inline void cpuacct_init(void)
-{
-}
-
 static inline void cpuacct_charge(struct task_struct *tsk, u64 cputime)
 {
 }