Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262431AbVAEOBN (ORCPT ); Wed, 5 Jan 2005 09:01:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262433AbVAEOBN (ORCPT ); Wed, 5 Jan 2005 09:01:13 -0500 Received: from alog0656.analogic.com ([208.224.223.193]:4992 "EHLO chaos.analogic.com") by vger.kernel.org with ESMTP id S262431AbVAEOBD (ORCPT ); Wed, 5 Jan 2005 09:01:03 -0500 Date: Wed, 5 Jan 2005 08:54:31 -0500 (EST) From: linux-os Reply-To: linux-os@analogic.com To: Linux kernel Subject: Patch fix shadowed vars in header. Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1671 Lines: 53 Trivial, obviously-correct patch corrects warnings about shadowed variables. Signed-off-by: rjohnson@analogic.com --- /usr/src/linux-2.6.10/include/linux/jiffies.h.orig 2004-12-24 16:33:49.000000000 -0500 +++ /usr/src/linux-2.6.10/include/linux/jiffies.h 2005-01-04 09:41:52.448765824 -0500 @@ -309,13 +309,13 @@ } static __inline__ void -jiffies_to_timespec(const unsigned long jiffies, struct timespec *value) +jiffies_to_timespec(const unsigned long tick, struct timespec *value) { /* * Convert jiffies to nanoseconds and separate with * one divide. */ - u64 nsec = (u64)jiffies * TICK_NSEC; + u64 nsec = (u64)tick * TICK_NSEC; value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &value->tv_nsec); } @@ -347,13 +347,13 @@ } static __inline__ void -jiffies_to_timeval(const unsigned long jiffies, struct timeval *value) +jiffies_to_timeval(const unsigned long tick, struct timeval *value) { /* * Convert jiffies to nanoseconds and separate with * one divide. */ - u64 nsec = (u64)jiffies * TICK_NSEC; + u64 nsec = (u64)tick * TICK_NSEC; value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &value->tv_usec); value->tv_usec /= NSEC_PER_USEC; } Cheers, Dick Johnson Penguin : Linux version 2.6.10 on an i686 machine (5537.79 BogoMips). Notice : All mail here is now cached for review by Dictator Bush. 98.36% of all statistics are fiction. - 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/