Commit-ID: 422fe7502e3f16dc1c680f22d31f59f022edc10d Gitweb: http://git.kernel.org/tip/422fe7502e3f16dc1c680f22d31f59f022edc10d Author: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> AuthorDate: Fri, 3 Apr 2015 15:21:51 +0200 Committer: Ingo Molnar <mingo@xxxxxxxxxx> 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@xxxxxxxxx> Cc: boris.ostrovsky@xxxxxxxxxx Cc: david.vrabel@xxxxxxxxxx Cc: konrad.wilk@xxxxxxxxxx Cc: peterz@xxxxxxxxxxxxx Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Link: http://lkml.kernel.org/r/8099075.V0LvN3pQAV@xxxxxxxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- 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--; -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|