]> git.baikalelectronics.ru Git - kernel.git/commit
time: Fix adjustment cleanup bug in timekeeping_adjust()
authorIngo Molnar <mingo@kernel.org>
Sat, 4 Aug 2012 19:21:14 +0000 (21:21 +0200)
committerIngo Molnar <mingo@kernel.org>
Sun, 5 Aug 2012 10:37:14 +0000 (12:37 +0200)
commit0e0ec2eb4e5de4f287f58cf7cc895bada011277f
treea11000cb9a7197b5d70573d0faa417cb36ba0e4b
parentafc8d41bb6f819e5a853f8a3348c7a6adf29bab5
time: Fix adjustment cleanup bug in timekeeping_adjust()

Tetsuo Handa reported that sporadically the system clock starts
counting up too quickly which is enough to confuse the hangcheck
timer to print a bogus stall warning.

Commit 3609c146 "time: Move xtime_nsec adjustment underflow handling
timekeeping_adjust" overlooked this exit path:

        } else
                return;

which should really be a proper exit sequence, fixing the bug as a
side effect.

Also make the flow more readable by properly balancing curly
braces.

Reported-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> wrote:
Tested-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> wrote:
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: john.stultz@linaro.org
Cc: a.p.zijlstra@chello.nl
Cc: richardcochran@gmail.com
Cc: prarit@redhat.com
Link: http://lkml.kernel.org/r/20120804192114.GA28347@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/time/timekeeping.c