diff options
author | Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> | 2012-01-09 19:24:05 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2012-01-10 03:57:41 -0500 |
commit | 9b9fb610f6800e0db46cccd8618dd7e609c9bb5a (patch) | |
tree | 9cd1157b35c144fc274f1deb14a88a2da3c5ce05 /kernel | |
parent | edf7c8148ec40c0fd27c0ef3f688defcc65e3913 (diff) |
sched: Remove empty #ifdefs
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/4F0B8525.8070901@ct.jp.nec.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/sched/core.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 4dbfd04a2148..457c881873cb 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c | |||
@@ -7136,10 +7136,6 @@ void set_curr_task(int cpu, struct task_struct *p) | |||
7136 | 7136 | ||
7137 | #endif | 7137 | #endif |
7138 | 7138 | ||
7139 | #ifdef CONFIG_RT_GROUP_SCHED | ||
7140 | #else /* !CONFIG_RT_GROUP_SCHED */ | ||
7141 | #endif /* CONFIG_RT_GROUP_SCHED */ | ||
7142 | |||
7143 | #ifdef CONFIG_CGROUP_SCHED | 7139 | #ifdef CONFIG_CGROUP_SCHED |
7144 | /* task_group_lock serializes the addition/removal of task groups */ | 7140 | /* task_group_lock serializes the addition/removal of task groups */ |
7145 | static DEFINE_SPINLOCK(task_group_lock); | 7141 | static DEFINE_SPINLOCK(task_group_lock); |
@@ -7248,9 +7244,6 @@ void sched_move_task(struct task_struct *tsk) | |||
7248 | } | 7244 | } |
7249 | #endif /* CONFIG_CGROUP_SCHED */ | 7245 | #endif /* CONFIG_CGROUP_SCHED */ |
7250 | 7246 | ||
7251 | #ifdef CONFIG_FAIR_GROUP_SCHED | ||
7252 | #endif | ||
7253 | |||
7254 | #if defined(CONFIG_RT_GROUP_SCHED) || defined(CONFIG_CFS_BANDWIDTH) | 7247 | #if defined(CONFIG_RT_GROUP_SCHED) || defined(CONFIG_CFS_BANDWIDTH) |
7255 | static unsigned long to_ratio(u64 period, u64 runtime) | 7248 | static unsigned long to_ratio(u64 period, u64 runtime) |
7256 | { | 7249 | { |