time: Fix casting issue in timekeeping_forward_now
authorAndreas Schwab <schwab@linux-m68k.org>
Wed, 22 Aug 2012 00:30:47 +0000 (20:30 -0400)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 22 Aug 2012 08:42:13 +0000 (10:42 +0200)
commit85dc8f05c93c8105987de9d7e7cebf15a72ff4ec
tree5be946b9b6f5be3c20fa4c6692b3a4491b86b0a9
parent784ffcbb96c3a97b4c64fd48b1dfe12ef3fcbcda
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>
kernel/time/timekeeping.c