From: John Stultz <john.stultz@linaro.org>
Date: Fri, 22 Mar 2013 22:04:13 +0000 (-0700)
Subject: timekeeping: Move ADJ_SETOFFSET to top level do_adjtimex()
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~116^2~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cef90377fab488bd1f959efda178fb83250cf61d;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed