[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <200607301837.17646.jesper.juhl@gmail.com>
Date: Sun, 30 Jul 2006 18:37:17 +0200
From: Jesper Juhl <jesper.juhl@...il.com>
To: linux-kernel@...r.kernel.org
Cc: Jesper Juhl <jesper.juhl@...il.com>, linux-kernel@...r.kernel.org
Subject: [PATCH 03/12] making the kernel -Wshadow clean - fix jiffies.h
Fix -Wshadow warnings in include/linux/jiffies.h
Signed-off-by: Jesper Juhl <jesper.juhl@...il.com>
---
include/linux/jiffies.h | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
--- linux-2.6.18-rc2-orig/include/linux/jiffies.h 2006-06-18 03:49:35.000000000 +0200
+++ linux-2.6.18-rc2/include/linux/jiffies.h 2006-07-18 20:31:57.000000000 +0200
@@ -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);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists