diff options
| author | Barry Song <21cnbao@gmail.com> | 2009-12-16 01:45:34 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 16:19:57 +0100 |
| commit | f065f41f48569122b5bcddbd1ba2354f7cc29fdc (patch) | |
| tree | 68606305bfb3aba16437017e0596ccae11e6f6db /kernel/time/timecompare.c | |
| parent | oom-kill: fix NUMA constraint check with nodemask (diff) | |
| download | linux-f065f41f48569122b5bcddbd1ba2354f7cc29fdc.tar.xz linux-f065f41f48569122b5bcddbd1ba2354f7cc29fdc.zip | |
timecompare: fix half-Y2K38 problem in timecompare_update while calculating offset
ktime will overflow from 03:14:07 UTC on Tuesday, 19 January 2038,
ktime_add() in timecompare_update() will overflow a half earlier. As a
result, wrong offset will be gotten, then cause some strange problems.
Signed-off-by: Barry Song <21cnbao@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Patrick Ohly <patrick.ohly@intel.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: John Stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/time/timecompare.c')
| -rw-r--r-- | kernel/time/timecompare.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timecompare.c b/kernel/time/timecompare.c index 96ff643a5a59..12f5c55090be 100644 --- a/kernel/time/timecompare.c +++ b/kernel/time/timecompare.c @@ -89,7 +89,7 @@ int timecompare_offset(struct timecompare *sync, * source time */ sample.offset = - ktime_to_ns(ktime_add(end, start)) / 2 - + (ktime_to_ns(end) + ktime_to_ns(start)) / 2 - ts; /* simple insertion sort based on duration */ |