]> Pileus Git - ~andy/linux/commit
projects / ~andy / linux / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 87ace39) | patch
timekeeping: Move ADJ_SETOFFSET to top level do_adjtimex()
authorJohn Stultz <john.stultz@linaro.org>
Fri, 22 Mar 2013 22:04:13 +0000 (15:04 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Thu, 4 Apr 2013 20:18:15 +0000 (13:18 -0700)
commitcef90377fab488bd1f959efda178fb83250cf61d
tree7ac4afc365ef3d35b339ac796d7ec921df618a58tree | snapshot
parent87ace39b7168bd9d352c1c52b6f5d88eb1876cf8commit | diff
timekeeping: Move ADJ_SETOFFSET to top level do_adjtimex()

Since ADJ_SETOFFSET adjusts the timekeeping state, process
it as part of the top level do_adjtimex() function in
timekeeping.c.

This avoids deadlocks that could occur once we change the
ntp locking rules.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
kernel/time/ntp.c diff | blob | history
kernel/time/timekeeping.c diff | blob | history
Andy's Linux Kernel repo