Commit cbbc719f authored by hank's avatar hank Committed by Ingo Molnar

time: Change jiffies_to_clock_t() argument type to unsigned long

The parameter's origin type is long. On an i386 architecture, it can
easily be larger than 0x80000000, causing this function to convert it
to a sign-extended u64 type.

Change the type to unsigned long so we get the correct result.
Signed-off-by: default avatarhank <pyu@redhat.com>
Cc: John Stultz <john.stultz@linaro.org>
Cc: <stable@kernel.org>
[ build fix ]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 4523f6ad
...@@ -303,7 +303,7 @@ extern void jiffies_to_timespec(const unsigned long jiffies, ...@@ -303,7 +303,7 @@ extern void jiffies_to_timespec(const unsigned long jiffies,
extern unsigned long timeval_to_jiffies(const struct timeval *value); extern unsigned long timeval_to_jiffies(const struct timeval *value);
extern void jiffies_to_timeval(const unsigned long jiffies, extern void jiffies_to_timeval(const unsigned long jiffies,
struct timeval *value); struct timeval *value);
extern clock_t jiffies_to_clock_t(long x); extern clock_t jiffies_to_clock_t(unsigned long x);
extern unsigned long clock_t_to_jiffies(unsigned long x); extern unsigned long clock_t_to_jiffies(unsigned long x);
extern u64 jiffies_64_to_clock_t(u64 x); extern u64 jiffies_64_to_clock_t(u64 x);
extern u64 nsec_to_clock_t(u64 x); extern u64 nsec_to_clock_t(u64 x);
......
...@@ -575,7 +575,7 @@ EXPORT_SYMBOL(jiffies_to_timeval); ...@@ -575,7 +575,7 @@ EXPORT_SYMBOL(jiffies_to_timeval);
/* /*
* Convert jiffies/jiffies_64 to clock_t and back. * Convert jiffies/jiffies_64 to clock_t and back.
*/ */
clock_t jiffies_to_clock_t(long x) clock_t jiffies_to_clock_t(unsigned long x)
{ {
#if (TICK_NSEC % (NSEC_PER_SEC / USER_HZ)) == 0 #if (TICK_NSEC % (NSEC_PER_SEC / USER_HZ)) == 0
# if HZ < USER_HZ # if HZ < USER_HZ
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment