Patch -Wshadow jiffies.h

["Richard B. Johnson" <linux-os@analogic.com>]

Many developers use -Wshadow when compiling so that they
don't accidentally use some global variable. Recent kernels
are compiled without this so some headers ended up with
local variables that shadow global ones.

Here is a patch for linux-2.6.11.9 that changes two variable
names in jiffies.h. This was previously submitted, but ignored.

The trivial patch is attached. Hopefully our global M$ mailer
doesn't kill it.

Signed-off-by: Richard B. Johnson linux-os@analogic.com


Cheers,
Dick Johnson
Penguin : Linux version 2.6.11 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.

--- linux-2.6.11.9/include/linux/jiffies.h.orig	2005-05-16 13:07:29.000000000 -0400
+++ linux-2.6.11.9/include/linux/jiffies.h	2005-05-16 13:10:22.000000000 -0400
@@ -328,13 +328,13 @@
 }
 
 static __inline__ void
-jiffies_to_timespec(const unsigned long jiffies, struct timespec *value)
+jiffies_to_timespec(const unsigned long jiffy, struct timespec *value)
 {
 	/*
 	 * Convert jiffies to nanoseconds and separate with
 	 * one divide.
 	 */
-	u64 nsec = (u64)jiffies * TICK_NSEC;
+	u64 nsec = (u64)jiffy * TICK_NSEC;
 	value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &value->tv_nsec);
 }
 
@@ -366,13 +366,13 @@
 }
 
 static __inline__ void
-jiffies_to_timeval(const unsigned long jiffies, struct timeval *value)
+jiffies_to_timeval(const unsigned long jiffy, struct timeval *value)
 {
 	/*
 	 * Convert jiffies to nanoseconds and separate with
 	 * one divide.
 	 */
-	u64 nsec = (u64)jiffies * TICK_NSEC;
+	u64 nsec = (u64)jiffy * TICK_NSEC;
 	value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &value->tv_usec);
 	value->tv_usec /= NSEC_PER_USEC;
 }