[PATCH 2.6] clean-up: fixes "shadows global" warning

From: Riina Kikas
Date: Mon Dec 06 2004 - 16:08:15 EST


This patch fixes warning "declaration of `jiffies' shadows a global declaration"
occuring on line 236

Signed-off-by: Riina Kikas <Riina.Kikas@xxxxxxx>

--- a/include/linux/time.h 2004-08-14 10:55:35.000000000 +0000
+++ b/include/linux/time.h 2004-12-02 21:16:18.000000000 +0000
@@ -233,13 +233,13 @@
}

static __inline__ void
-jiffies_to_timespec(const unsigned long jiffies, struct timespec *value)
+jiffies_to_timespec(const unsigned long jiffy_count, struct timespec *value)
{
/*
* Convert jiffies to nanoseconds and separate with
* one divide.
*/
- u64 nsec = (u64)jiffies * TICK_NSEC; + u64 nsec = (u64)jiffy_count * TICK_NSEC;
value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &value->tv_nsec);
}

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/