lkml.org 
[lkml]   [2007]   [Jun]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [patch] CFS scheduler, -v17
    Em Fri, 15 Jun 2007 00:49:08 +0200
    Ingo Molnar <mingo@elte.hu> escreveu:

    |
    | i'm pleased to announce release -v17 of the CFS scheduler patchset.
    |
    | The rolled-up CFS patch against v2.6.22-rc4, v2.6.22-rc4-mm2, v2.6.21.5
    | or v2.6.20.13 can be downloaded from the usual place:
    |
    | http://people.redhat.com/mingo/cfs-scheduler/

    Hmm, I'm getting this while compiling:

    """
    LD .tmp_vmlinux1
    kernel/built-in.o: In function `rq_clock':
    /home/lcapitulino/src/kernels/upstream/linux-2.6-cfs/kernel/sched.c:321: undefined reference to `cpu_of'
    /home/lcapitulino/src/kernels/upstream/linux-2.6-cfs/kernel/sched.c:321: undefined reference to `cpu_of'
    /home/lcapitulino/src/kernels/upstream/linux-2.6-cfs/kernel/sched.c:321: undefined reference to `cpu_of'
    /home/lcapitulino/src/kernels/upstream/linux-2.6-cfs/kernel/sched.c:321: undefined reference to `cpu_of'
    /home/lcapitulino/src/kernels/upstream/linux-2.6-cfs/kernel/sched.c:321: undefined reference to `cpu_of'
    kernel/built-in.o:/home/lcapitulino/src/kernels/upstream/linux-2.6-cfs/kernel/sched.c:321: more undefined references to `cpu_of' follow
    make: *** [.tmp_vmlinux1] Error 1
    """

    The code in question is really strange:

    #ifdef CONFIG_SMP
    ...
    static inline int cpu_of(struct rq *rq)
    #ifdef CONFIG_SMP
    return rq->cpu;
    #else
    return 0;
    #endif
    }
    ...
    #endif

    Patch follows, only compile tested, hope it helps.

    ------

    [PATCH]: Fix undefined reference to `cpu_of'

    cpu_of() is defined inside a CONFIG_SMP #ifdef/#endif but called
    by !CONFIG_SMP code.

    This patch fixes that by creating a !CONFIG_SMP version of cpu_of().

    Signed-off-by: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>

    diff --git a/kernel/sched.c b/kernel/sched.c
    index abe6fab..be63f73 100644
    --- a/kernel/sched.c
    +++ b/kernel/sched.c
    @@ -259,13 +259,9 @@ static inline u32 sg_div_cpu_power(const struct sched_group *sg, u32 load)
    return reciprocal_divide(load, sg->reciprocal_cpu_power);
    }

    -static inline int cpu_of(struct rq *rq)
    +static inline int cpu_of(const struct rq *rq)
    {
    -#ifdef CONFIG_SMP
    return rq->cpu;
    -#else
    - return 0;
    -#endif
    }

    /*
    @@ -277,7 +273,13 @@ static inline void sg_inc_cpu_power(struct sched_group *sg, u32 val)
    sg->__cpu_power += val;
    sg->reciprocal_cpu_power = reciprocal_value(sg->__cpu_power);
    }
    -#endif
    +#else /* !CONFIG_SMP */
    +static inline int cpu_of(const struct rq *rq)
    +{
    + return 0;
    +}
    +#endif /* CONFIG_SMP */
    +
    /*
    * Per-runqueue clock, as finegrained as the platform can give us:
    */

    --
    Luiz Fernando N. Capitulino
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-06-15 18:33    [W:0.030 / U:154.068 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site