lkml.org 
[lkml]   [2003]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] fix #endif misplacement
    This patch fixes an #endif misplacement, which leads to dead code in
    sched_clock() in arch/i386/kernel/timers/timer_tsc.c, due to a return
    outside the ifdef/endif.

    Please consider applying, as sched_clock() apparently does not behave as
    expected. Patched against 2.6.0-test11.

    Regards.

    --
    Ricardo Nabinger Sanchez
    GNU/Linux #140696 [http://counter.li.org]
    Slackware Linux

    Warning:
    Trespassers will be shot.
    Survivors will be shot again.



    diff -urN linux-2.6.0-test11/arch/i386/kernel/timers/timer_tsc.c
    linux-2.6.0-test11-sched_clock/arch/i386/kernel/timers/timer_tsc.c
    --- linux-2.6.0-test11/arch/i386/kernel/timers/timer_tsc.c 2003-11-26 18:44:45.000000000 -0200
    +++ linux-2.6.0-test11-sched_clock/arch/i386/kernel/timers/timer_tsc.c 2003-11-28 12:58:59.000000000 -0200
    @@ -140,8 +140,8 @@
    */
    #ifndef CONFIG_NUMA
    if (!use_tsc)
    -#endif
    return (unsigned long long)jiffies * (1000000000 / HZ);
    +#endif

    /* Read the Time Stamp Counter */
    rdtscll(this_offset);
    -
    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: 2005-03-22 13:58    [W:0.024 / U:88.784 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site