diff options
| author | Cyrill Gorcunov <gorcunov@openvz.org> | 2009-10-26 15:24:14 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-08 07:15:48 -0500 |
| commit | e9036b36eed4d3cdb33fa9cbcdd9888ae516889f (patch) | |
| tree | 769497c425cfe602e7765884185cd769428cc67e /kernel | |
| parent | 968c86458a5975efa7a95f832a4ec9fb21471137 (diff) | |
sched: Use root_task_group_empty only with FAIR_GROUP_SCHED
root_task_group_empty is used only with FAIR_GROUP_SCHED
so if we use other scheduler options we get:
kernel/sched.c:314: warning: 'root_task_group_empty' defined but not used
So move CONFIG_FAIR_GROUP_SCHED up that it covers
root_task_group_empty().
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <20091026192414.GB5321@lenovo>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 7d7d5fcca4cb..3c11ae0a948d 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -309,6 +309,8 @@ static DEFINE_PER_CPU_SHARED_ALIGNED(struct rt_rq, init_rt_rq); | |||
| 309 | */ | 309 | */ |
| 310 | static DEFINE_SPINLOCK(task_group_lock); | 310 | static DEFINE_SPINLOCK(task_group_lock); |
| 311 | 311 | ||
| 312 | #ifdef CONFIG_FAIR_GROUP_SCHED | ||
| 313 | |||
| 312 | #ifdef CONFIG_SMP | 314 | #ifdef CONFIG_SMP |
| 313 | static int root_task_group_empty(void) | 315 | static int root_task_group_empty(void) |
| 314 | { | 316 | { |
| @@ -316,7 +318,6 @@ static int root_task_group_empty(void) | |||
| 316 | } | 318 | } |
| 317 | #endif | 319 | #endif |
| 318 | 320 | ||
| 319 | #ifdef CONFIG_FAIR_GROUP_SCHED | ||
| 320 | #ifdef CONFIG_USER_SCHED | 321 | #ifdef CONFIG_USER_SCHED |
| 321 | # define INIT_TASK_GROUP_LOAD (2*NICE_0_LOAD) | 322 | # define INIT_TASK_GROUP_LOAD (2*NICE_0_LOAD) |
| 322 | #else /* !CONFIG_USER_SCHED */ | 323 | #else /* !CONFIG_USER_SCHED */ |
