time: Fix casting issue in timekeeping_forward_now
arch_gettimeoffset returns a u32 value which when shifted by tk->shift
can overflow. This issue was introduced with 1e75fa8be
(time: Condense
timekeeper.xtime into xtime_sec)
Cast it to u64 first.
Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>
Link: http://lkml.kernel.org/r/1345595449-34965-3-git-send-email-john.stultz@linaro.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Родитель
784ffcbb96
Коммит
85dc8f05c9
|
@ -277,7 +277,7 @@ static void timekeeping_forward_now(struct timekeeper *tk)
|
||||||
tk->xtime_nsec += cycle_delta * tk->mult;
|
tk->xtime_nsec += cycle_delta * tk->mult;
|
||||||
|
|
||||||
/* If arch requires, add in gettimeoffset() */
|
/* If arch requires, add in gettimeoffset() */
|
||||||
tk->xtime_nsec += arch_gettimeoffset() << tk->shift;
|
tk->xtime_nsec += (u64)arch_gettimeoffset() << tk->shift;
|
||||||
|
|
||||||
tk_normalize_xtime(tk);
|
tk_normalize_xtime(tk);
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче