lkml.org 
[lkml]   [2006]   [Jul]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[RFC][PATCH 4/9] -Wshadow: fix warnings caused by jiffies.h
Date
(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.


Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
---

include/linux/jiffies.h | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)

--- linux-2.6.18-rc1-orig/include/linux/jiffies.h 2006-06-18 03:49:35.000000000 +0200
+++ linux-2.6.18-rc1/include/linux/jiffies.h 2006-07-09 20:24:17.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@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2006-07-10 13:19    [W:0.033 / U:0.404 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site