From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758972AbXFWNXA (ORCPT ); Sat, 23 Jun 2007 09:23:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756427AbXFWNV6 (ORCPT ); Sat, 23 Jun 2007 09:21:58 -0400 Received: from www.osadl.org ([213.239.205.134]:59183 "EHLO mail.tglx.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756130AbXFWNV5 (ORCPT ); Sat, 23 Jun 2007 09:21:57 -0400 Message-Id: <20070623124030.306756083@inhelltoy.tec.linutronix.de> References: <20070623124005.931747831@inhelltoy.tec.linutronix.de> User-Agent: quilt/0.46-1 Date: Sat, 23 Jun 2007 13:32:29 -0000 From: Thomas Gleixner To: Andrew Morton Cc: Andi Kleen , Ingo Molnar , Arjan van de Ven , Venkatesh Pallipadi , John Stultz , Chris Wright , LKML Subject: [patch -mm 04/28] 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-23 14:38:57.000000000 +0200 +++ linux-2.6.22-rc4-mm/kernel/time/timekeeping.c 2007-06-23 14:38:57.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; --