mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

time: Change jiffies_to_clock_t() argument type to unsigned long

Browse source 
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: hank <pyu@redhat.com>
Cc: John Stultz <john.stultz@linaro.org>
Cc: <stable@kernel.org>
[ build fix ]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
hank 2011-09-20 13:53:39 -07:00 committed by Ingo Molnar
parent 4523f6ada8
commit cbbc719fcc
2 changed files with 2 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
include/linux/jiffies.h
View file

@ -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);

2
kernel/time.c
View file

@ -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