]> Pileus Git - ~andy/linux/commit
time: Ensure we normalize the timekeeper in tk_xtime_add
authorJohn Stultz <john.stultz@linaro.org>
Wed, 22 Aug 2012 00:30:46 +0000 (20:30 -0400)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 22 Aug 2012 08:42:12 +0000 (10:42 +0200)
commit784ffcbb96c3a97b4c64fd48b1dfe12ef3fcbcda
treebd413e1c43512c1963d25ed25dd617642a639444
parent4e8b14526ca7fb046a81c94002c1c43b6fdf0e9b
time: Ensure we normalize the timekeeper in tk_xtime_add

Andreas noticed problems with resume on specific hardware after commit
1e75fa8b (time: Condense timekeeper.xtime into xtime_sec) combined
with commit b44d50dca (time: Fix casting issue in tk_set_xtime and
tk_xtime_add)

After some digging I realized we aren't normalizing the timekeeper
after the add. Add the missing normalize call.

Reported-by: Andreas Schwab <schwab@linux-m68k.org>
Tested-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-2-git-send-email-john.stultz@linaro.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
kernel/time/timekeeping.c