From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754659AbXFJJc3 (ORCPT ); Sun, 10 Jun 2007 05:32:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752669AbXFJJbA (ORCPT ); Sun, 10 Jun 2007 05:31:00 -0400 Received: from www.osadl.org ([213.239.205.134]:43043 "EHLO mail.tglx.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753017AbXFJJaz (ORCPT ); Sun, 10 Jun 2007 05:30:55 -0400 Message-Id: <20070610092446.513563532@inhelltoy.tec.linutronix.de> References: <20070610092437.118387863@inhelltoy.tec.linutronix.de> User-Agent: quilt/0.46-1 Date: Sun, 10 Jun 2007 09:44:02 -0000 From: Thomas Gleixner To: LKML Cc: Andrew Morton , Ingo Molnar , Andi Kleen , Arjan van de Ven , Venkatesh Pallipadi , Chris Wright , john stultz Subject: [patch-mm 04/23] Timekeeping: Fixup shadow variable argument Content-Disposition: inline; filename=timekeeping-c-fixup-clock-shadow-global-variable.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org clocksource_adjust() has a clock argument, which shadows the file global clock variable. Fix this up. Signed-off-by: Thomas Gleixner Cc: john stultz --- 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-10 10:44:37.000000000 +0200 +++ linux-2.6.22-rc4-mm/kernel/time/timekeeping.c 2007-06-10 10:44:38.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; --