Skip to contentSkip to conversation

-Wshadow: fix warnings caused by jiffies.h

RFC PATCH In review Jesper Juhl 1 participant 1 message Jul 10, 2006

lore
Share & tools
lore
#0 lore raw

RFC PATCH 4/9 -Wshadow: fix warnings caused by jiffies.h

(please see the mail titled
"[RFC][PATCH 0/9] -Wshadow: Making the kernel build clean with -Wshadow" for an explanation of why I'm doing this)

Fix -Wshadow warnings in include/linux/jiffies.h

This one really cuts down a lot of warnings.

---

 include/linux/jiffies.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
include/linux/jiffies.h +4 -4
@@ -325,13 +325,13 @@ timespec_to_jiffies(const struct timespe
 }
 
 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);
 }
 
@@ -363,13 +363,13 @@ timeval_to_jiffies(const struct timeval 
 }
 
 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;
 	long tv_usec;
 
 	value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &tv_usec);