lkml.org 
[lkml]   [2007]   [May]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch] sched_clock(): cleanups, #2

    * Ingo Molnar <mingo@elte.hu> wrote:

    > * Andi Kleen <andi@firstfloor.org> wrote:
    >
    > > > please send me your current sched-clock.c, i'll redo any remaining
    > > > cleanups.
    > >
    > > It needs at least one new preliminary patch (to add on_cpu_single);
    > > please get the series from
    > > ftp://ftp.firstfloor.org/pub/ak/x86_64/quilt/patches-2.6.22-rc2-git7-070525-1.tar.gz
    > > You need at least tsc-unstable upto paravirt-add-a-sched_clock-paravirt
    > > for everything
    >
    > thanks.
    >
    > you missed one patch: please pick up the NUMAQ change i did too. (i
    > kept the printk to make sure someone notices that and actually tests
    > thing - i dont have a NUMAQ machine to try this on.)
    >
    > i'm looking at the other things now.

    find below the cleanups from my first patch that didnt make it into your
    cleanups. (plus one more cleanup i noticed while merging the missing
    bits from my first patch) Goes after the bugfix i just sent. Please
    apply.

    Ingo

    ---------------------->
    Subject: [patch] sched_clock(): cleanups, #2
    From: Ingo Molnar <mingo@elte.hu>

    clean up sched-clock.c - the missing bits.

    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    ---
    arch/i386/kernel/sched-clock.c | 20 ++++++++++++++------
    1 file changed, 14 insertions(+), 6 deletions(-)

    Index: linux-cfs-2.6.22-rc2-mm1.q/arch/i386/kernel/sched-clock.c
    ===================================================================
    --- linux-cfs-2.6.22-rc2-mm1.q.orig/arch/i386/kernel/sched-clock.c
    +++ linux-cfs-2.6.22-rc2-mm1.q/arch/i386/kernel/sched-clock.c
    @@ -89,8 +89,10 @@ unsigned long long native_sched_clock(vo
    return r;
    }

    -/* We need to define a real function for sched_clock, to override the
    - weak default version */
    +/*
    + * We need to define a real function for sched_clock, to override the
    + * weak default version
    + */
    #ifdef CONFIG_PARAVIRT
    unsigned long long sched_clock(void)
    {
    @@ -119,6 +121,9 @@ static void resolve_freq(struct cpufreq_
    {
    if (!freq->new) {
    freq->new = cpufreq_get(freq->cpu);
    + /*
    + * Still no frequency? Then fall back to tsc_khz:
    + */
    if (!freq->new)
    freq->new = tsc_khz;
    }
    @@ -129,6 +134,7 @@ static void resync_freq(void *arg)
    {
    struct cpufreq_freqs *freq = (void *)arg;
    struct sc_data *sc = &__get_cpu_var(sc_data);
    +
    sc->sync_base = jiffies;
    if (!cpu_has_tsc) {
    sc->unstable = 1;
    @@ -155,13 +161,14 @@ static void resync_freq(void *arg)
    static void resync_freq_on_cpu(void *arg)
    {
    struct cpufreq_freqs f = { .new = 0 };
    +
    f.cpu = get_cpu();
    resync_freq(&f);
    put_cpu();
    }

    -static int sc_freq_event(struct notifier_block *nb, unsigned long event,
    - void *data)
    +static int
    +sc_freq_event(struct notifier_block *nb, unsigned long event, void *data)
    {
    struct cpufreq_freqs *freq = data;
    struct sc_data *sc;
    @@ -210,8 +217,10 @@ static int __cpuinit
    sc_cpu_event(struct notifier_block *self, unsigned long event, void *hcpu)
    {
    long cpu = (long)hcpu;
    +
    if (event == CPU_ONLINE) {
    struct cpufreq_freqs f = { .cpu = cpu, .new = 0 };
    +
    on_cpu_single(cpu, resync_freq, &f);
    }
    return NOTIFY_DONE;
    @@ -221,7 +230,6 @@ static __init int init_sched_clock(void)
    {
    if (unsynchronized_tsc())
    no_sc_for_printk = 1;
    -
    /*
    * On a race between the various events the initialization
    * might be done multiple times, but code is tolerant to
    @@ -231,7 +239,7 @@ static __init int init_sched_clock(void)
    CPUFREQ_TRANSITION_NOTIFIER);
    hotcpu_notifier(sc_cpu_event, 0);
    on_each_cpu(resync_freq_on_cpu, NULL, 0, 0);
    +
    return 0;
    }
    core_initcall(init_sched_clock);
    -
    -
    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-05-25 13:53    [W:4.673 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site