renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-15 00:34:10 +08:00
Code

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse Source 
Pull timer fix from Ingo Molnar:
 "One more timekeeping fix for v3.6"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  time: Fix timeekeping_get_ns overflow on 32bit systems
This commit is contained in:
Linus Torvalds 2012-09-21 14:25:46 -07:00
commit 519b3b742d
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kernel/time/timekeeping.c
View File

@ -303,10 +303,11 @@ void getnstimeofday(struct timespec *ts)
seq = read_seqbegin(&tk->lock); seq = read_seqbegin(&tk->lock);
ts->tv_sec = tk->xtime_sec; ts->tv_sec = tk->xtime_sec;
ts->tv_nsec = timekeeping_get_ns(tk); nsecs = timekeeping_get_ns(tk);
} while (read_seqretry(&tk->lock, seq)); } while (read_seqretry(&tk->lock, seq));
ts->tv_nsec = 0;
timespec_add_ns(ts, nsecs); timespec_add_ns(ts, nsecs);
} }
EXPORT_SYMBOL(getnstimeofday); EXPORT_SYMBOL(getnstimeofday);
@ -345,6 +346,7 @@ void ktime_get_ts(struct timespec *ts)
{ {
struct timekeeper *tk = &timekeeper; struct timekeeper *tk = &timekeeper;
struct timespec tomono; struct timespec tomono;
s64 nsec;
unsigned int seq; unsigned int seq;
WARN_ON(timekeeping_suspended); WARN_ON(timekeeping_suspended);
@ -352,13 +354,14 @@ void ktime_get_ts(struct timespec *ts)
do { do {
seq = read_seqbegin(&tk->lock); seq = read_seqbegin(&tk->lock);
ts->tv_sec = tk->xtime_sec; ts->tv_sec = tk->xtime_sec;
ts->tv_nsec = timekeeping_get_ns(tk); nsec = timekeeping_get_ns(tk);
tomono = tk->wall_to_monotonic; tomono = tk->wall_to_monotonic;
} while (read_seqretry(&tk->lock, seq)); } while (read_seqretry(&tk->lock, seq));
set_normalized_timespec(ts, ts->tv_sec + tomono.tv_sec, ts->tv_sec += tomono.tv_sec;
ts->tv_nsec + tomono.tv_nsec); ts->tv_nsec = 0;
timespec_add_ns(ts, nsec + tomono.tv_nsec);
} }
EXPORT_SYMBOL_GPL(ktime_get_ts); EXPORT_SYMBOL_GPL(ktime_get_ts);
@ -1244,6 +1247,7 @@ void get_monotonic_boottime(struct timespec *ts)
{ {
struct timekeeper *tk = &timekeeper; struct timekeeper *tk = &timekeeper;
struct timespec tomono, sleep; struct timespec tomono, sleep;
s64 nsec;
unsigned int seq; unsigned int seq;
WARN_ON(timekeeping_suspended); WARN_ON(timekeeping_suspended);
@ -1251,14 +1255,15 @@ void get_monotonic_boottime(struct timespec *ts)
do { do {
seq = read_seqbegin(&tk->lock); seq = read_seqbegin(&tk->lock);
ts->tv_sec = tk->xtime_sec; ts->tv_sec = tk->xtime_sec;
ts->tv_nsec = timekeeping_get_ns(tk); nsec = timekeeping_get_ns(tk);
tomono = tk->wall_to_monotonic; tomono = tk->wall_to_monotonic;
sleep = tk->total_sleep_time; sleep = tk->total_sleep_time;
} while (read_seqretry(&tk->lock, seq)); } while (read_seqretry(&tk->lock, seq));
set_normalized_timespec(ts, ts->tv_sec + tomono.tv_sec + sleep.tv_sec, ts->tv_sec += tomono.tv_sec + sleep.tv_sec;
ts->tv_nsec + tomono.tv_nsec + sleep.tv_nsec); ts->tv_nsec = 0;
timespec_add_ns(ts, nsec + tomono.tv_nsec + sleep.tv_nsec);
} }
EXPORT_SYMBOL_GPL(get_monotonic_boottime); EXPORT_SYMBOL_GPL(get_monotonic_boottime);