lkml.org 
[lkml]   [2007]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch-mm 04/25] Timekeeping: Fixup shadow variable argument
    clocksource_adjust() has a clock argument, which shadows the file 
    global clock variable. Fix this up.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: john stultz <johnstul@us.ibm.com>

    ---
    kernel/time/timekeeping.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    Index: linux-2.6.22-rc4-mm/kernel/time/timekeeping.c
    ===================================================================
    --- linux-2.6.22-rc4-mm.orig/kernel/time/timekeeping.c 2007-06-16 12:10:22.000000000 +0200
    +++ linux-2.6.22-rc4-mm/kernel/time/timekeeping.c 2007-06-16 12:10:23.000000000 +0200
    @@ -401,7 +401,7 @@ static __always_inline int clocksource_b
    * this is optimized for the most common adjustments of -1,0,1,
    * for other values we can do a bit more work.
    */
    -static void clocksource_adjust(struct clocksource *clock, s64 offset)
    +static void clocksource_adjust(s64 offset)
    {
    s64 error, interval = clock->cycle_interval;
    int adj;
    @@ -476,7 +476,7 @@ void update_wall_time(void)
    }

    /* correct the clock when NTP error is too big */
    - clocksource_adjust(clock, offset);
    + clocksource_adjust(offset);

    /* store full nanoseconds into xtime */
    xtime.tv_nsec = (s64)clock->xtime_nsec >> clock->shift;
    --

    -
    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-16 12:27    [W:0.021 / U:397.372 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site