From 612417c69a7a5156c97d0f2cf7131432e8bead04 Mon Sep 17 00:00:00 2001
From: Srivatsa Vaddagiri <vatsa@linux.vnet.ibm.com>
Date: Fri, 25 Jan 2008 21:07:59 +0100
Subject: [PATCH] --- yaml --- r: 76113 b: refs/heads/master c:
 93f992ccc008dd4030381caeebb252e85e66684b h: refs/heads/master i:   76111:
 477bbb7bf79330d97b72296d974fdfbd26310972 v: v3

---
 [refs]               |  2 +-
 trunk/kernel/sched.c | 21 +++------------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 48043fdce255..aefd5870cd8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86faf39d0fc04272b05fab1db6d683f3ac7199d1
+refs/heads/master: 93f992ccc008dd4030381caeebb252e85e66684b
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index e76b11ca6df3..7f827b70ae02 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -191,12 +191,12 @@ struct task_group init_task_group = {
 };
 
 #ifdef CONFIG_FAIR_USER_SCHED
-# define INIT_TASK_GRP_LOAD	2*NICE_0_LOAD
+# define INIT_TASK_GROUP_LOAD	2*NICE_0_LOAD
 #else
-# define INIT_TASK_GRP_LOAD	NICE_0_LOAD
+# define INIT_TASK_GROUP_LOAD	NICE_0_LOAD
 #endif
 
-static int init_task_group_load = INIT_TASK_GRP_LOAD;
+static int init_task_group_load = INIT_TASK_GROUP_LOAD;
 
 /* return group to which a task belongs */
 static inline struct task_group *task_group(struct task_struct *p)
@@ -881,21 +881,6 @@ static inline void cpuacct_charge(struct task_struct *tsk, u64 cputime) {}
 
 #define sched_class_highest (&rt_sched_class)
 
-/*
- * Update delta_exec, delta_fair fields for rq.
- *
- * delta_fair clock advances at a rate inversely proportional to
- * total load (rq->load.weight) on the runqueue, while
- * delta_exec advances at the same rate as wall-clock (provided
- * cpu is not idle).
- *
- * delta_exec / delta_fair is a measure of the (smoothened) load on this
- * runqueue over any given interval. This (smoothened) load is used
- * during load balance.
- *
- * This function is called /before/ updating rq->load
- * and when switching tasks.
- */
 static inline void inc_load(struct rq *rq, const struct task_struct *p)
 {
 	update_load_add(&rq->load, p->se.load.weight);