lkml.org 
[lkml]   [2011]   [Jan]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:sched/core] sched: Remove redundant CONFIG_CGROUP_SCHED ifdef
    Commit-ID:  6706125e291bd3dddd269e043323a6ab93ccd5fb
    Gitweb: http://git.kernel.org/tip/6706125e291bd3dddd269e043323a6ab93ccd5fb
    Author: Yong Zhang <yong.zhang0@gmail.com>
    AuthorDate: Fri, 31 Dec 2010 21:58:58 +0800
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Tue, 4 Jan 2011 09:42:03 +0100

    sched: Remove redundant CONFIG_CGROUP_SCHED ifdef

    CONFIG_[FAIR|RT]_GROUP_SCHED always means CONFIG_CGROUP_SCHED

    Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    LKML-Reference: <1293803938-8157-1-git-send-email-yong.zhang0@gmail.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    ---
    kernel/sched.c | 4 ----
    1 files changed, 0 insertions(+), 4 deletions(-)

    diff --git a/kernel/sched.c b/kernel/sched.c
    index 3925a1b..9f9dd8d 100644
    --- a/kernel/sched.c
    +++ b/kernel/sched.c
    @@ -7777,7 +7777,6 @@ void __init sched_init(void)
    #ifdef CONFIG_FAIR_GROUP_SCHED
    init_task_group.shares = init_task_group_load;
    INIT_LIST_HEAD(&rq->leaf_cfs_rq_list);
    -#ifdef CONFIG_CGROUP_SCHED
    /*
    * How much cpu bandwidth does init_task_group get?
    *
    @@ -7798,16 +7797,13 @@ void __init sched_init(void)
    * directly in rq->cfs (i.e init_task_group->se[] = NULL).
    */
    init_tg_cfs_entry(&init_task_group, &rq->cfs, NULL, i, NULL);
    -#endif
    #endif /* CONFIG_FAIR_GROUP_SCHED */

    rq->rt.rt_runtime = def_rt_bandwidth.rt_runtime;
    #ifdef CONFIG_RT_GROUP_SCHED
    INIT_LIST_HEAD(&rq->leaf_rt_rq_list);
    -#ifdef CONFIG_CGROUP_SCHED
    init_tg_rt_entry(&init_task_group, &rq->rt, NULL, i, NULL);
    #endif
    -#endif

    for (j = 0; j < CPU_LOAD_IDX_MAX; j++)
    rq->cpu_load[j] = 0;

    \
     
     \ /
      Last update: 2011-01-04 10:27    [W:0.021 / U:31.080 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site