2005-01-04 14:57:12

by linux-os

[permalink] [raw]
Subject: Linux-2.6.10 fix "shadow" declaration warnings.


Linux-2.6.10 has compiler warnings with -Wshadow..


--- /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.