diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-08 09:50:24 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-08 09:50:24 (GMT) |
| commit | ed7b40c90e80559ab2d86a19516a5211733e34c9 (patch) | |
| tree | 4607434458cde852d87660f9712afc0c85fdb3ea /kernel | |
| parent | 3e0283a53f7d2f2dae7bc4aa7f3104cb5988018f (diff) | |
| parent | 2df8406a439bdeacbb5b74bbf91c376447d447dc (diff) | |
| download | linux-ed7b40c90e80559ab2d86a19516a5211733e34c9.tar.xz | |
Merge branch 'sched/urgent' into sched/core
So this isn't really a fix but a cleanup that can wait for v4.2.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/auto_group.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c index eae160d..1a3b58d 100644 --- a/kernel/sched/auto_group.c +++ b/kernel/sched/auto_group.c @@ -1,5 +1,3 @@ -#ifdef CONFIG_SCHED_AUTOGROUP - #include "sched.h" #include <linux/proc_fs.h> @@ -249,5 +247,3 @@ int autogroup_path(struct task_group *tg, char *buf, int buflen) return snprintf(buf, buflen, "%s-%ld", "/autogroup", tg->autogroup->id); } #endif /* CONFIG_SCHED_DEBUG */ - -#endif /* CONFIG_SCHED_AUTOGROUP */ |