From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 16 Jun 2008 09:15:21 +0000 (+0200)
Subject: Merge branch 'linus' into sched-devel
X-Git-Tag: v2.6.27-rc1~1105^2~52
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f9e8e07e074a880e110922759dcdb369fecdf07c;p=linux-2.6-omap-h63xx.git

Merge branch 'linus' into sched-devel
---

f9e8e07e074a880e110922759dcdb369fecdf07c
diff --cc kernel/sched.c
index 07d5472dee9,eaf6751e761..554de400980
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@@ -310,12 -307,15 +310,15 @@@ static DEFINE_SPINLOCK(task_group_lock)
  #ifdef CONFIG_FAIR_GROUP_SCHED
  #ifdef CONFIG_USER_SCHED
  # define INIT_TASK_GROUP_LOAD	(2*NICE_0_LOAD)
 -#else
 +#else /* !CONFIG_USER_SCHED */
  # define INIT_TASK_GROUP_LOAD	NICE_0_LOAD
 -#endif
 +#endif /* CONFIG_USER_SCHED */
  
  /*
-  * A weight of 0, 1 or ULONG_MAX can cause arithmetics problems.
+  * A weight of 0 or 1 can cause arithmetics problems.
+  * A weight of a cfs_rq is the sum of weights of which entities
+  * are queued on this cfs_rq, so a weight of a entity should not be
+  * too large, so as the shares value of a task group.
   * (The default weight is 1024 - so there's no practical
   *  limitation from this.)
   */