diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-05-02 14:48:57 (GMT) |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-05-02 19:37:58 (GMT) |
commit | b12a03ce4880bd13786a98db6de494a3e0123129 (patch) | |
tree | 2a8f2cf0d1d6749b4a33cc07c9b7839a4a139e9a /kernel/time/timekeeping.c | |
parent | 942c3c5c329274fa6de5998cb911cf3d0a42d0b1 (diff) | |
download | linux-fsl-qoriq-b12a03ce4880bd13786a98db6de494a3e0123129.tar.xz |
hrtimers: Prepare for cancel on clock was set timers
Make clock_was_set() unconditional and rename hres_timers_resume to
hrtimers_resume. This is a preparatory patch for hrtimers which are
cancelled when clock realtime was set.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/time/timekeeping.c')
-rw-r--r-- | kernel/time/timekeeping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 8e6a05a..a61b8fa 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -680,7 +680,7 @@ static void timekeeping_resume(void) clockevents_notify(CLOCK_EVT_NOTIFY_RESUME, NULL); /* Resume hrtimers */ - hres_timers_resume(); + hrtimers_resume(); } static int timekeeping_suspend(void) |