Messages in this thread Patch in this message | ![/](/images/icornerl.gif) | | Date | Fri, 3 Apr 2015 06:18:41 -0700 | From | "tip-bot for Rafael J. Wysocki" <> | Subject | [tip:timers/core] timers/PM: Fix up tick_unfreeze() |
| |
Commit-ID: 422fe7502e3f16dc1c680f22d31f59f022edc10d Gitweb: http://git.kernel.org/tip/422fe7502e3f16dc1c680f22d31f59f022edc10d Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com> AuthorDate: Fri, 3 Apr 2015 15:21:51 +0200 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Fri, 3 Apr 2015 15:15:51 +0200
timers/PM: Fix up tick_unfreeze()
A recent conflict resolution has left tick_resume() in tick_unfreeze() which leads to an unbalanced execution of tick_resume_broadcast() every time that function runs.
Fix that by replacing the tick_resume() in tick_unfreeze() with tick_resume_local() as appropriate.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Cc: boris.ostrovsky@oracle.com Cc: david.vrabel@citrix.com Cc: konrad.wilk@oracle.com Cc: peterz@infradead.org Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/8099075.V0LvN3pQAV@vostro.rjw.lan Signed-off-by: Ingo Molnar <mingo@kernel.org> --- kernel/time/tick-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c index fac3e98..ad66a51 100644 --- a/kernel/time/tick-common.c +++ b/kernel/time/tick-common.c @@ -482,7 +482,7 @@ void tick_unfreeze(void) if (tick_freeze_depth == num_online_cpus()) timekeeping_resume(); else - tick_resume(); + tick_resume_local(); tick_freeze_depth--;
| ![\](/images/icornerr.gif) |