From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752709AbbDCNTF (ORCPT ); Fri, 3 Apr 2015 09:19:05 -0400 Received: from terminus.zytor.com ([198.137.202.10]:47691 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752628AbbDCNTD (ORCPT ); Fri, 3 Apr 2015 09:19:03 -0400 Date: Fri, 3 Apr 2015 06:18:41 -0700 From: "tip-bot for Rafael J. Wysocki" Message-ID: Cc: rafael.j.wysocki@intel.com, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org Reply-To: tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, rafael.j.wysocki@intel.com, mingo@kernel.org In-Reply-To: <8099075.V0LvN3pQAV@vostro.rjw.lan> References: <8099075.V0LvN3pQAV@vostro.rjw.lan> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] timers/PM: Fix up tick_unfreeze() Git-Commit-ID: 422fe7502e3f16dc1c680f22d31f59f022edc10d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 422fe7502e3f16dc1c680f22d31f59f022edc10d Gitweb: http://git.kernel.org/tip/422fe7502e3f16dc1c680f22d31f59f022edc10d Author: Rafael J. Wysocki AuthorDate: Fri, 3 Apr 2015 15:21:51 +0200 Committer: Ingo Molnar 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 Cc: boris.ostrovsky@oracle.com Cc: david.vrabel@citrix.com Cc: konrad.wilk@oracle.com Cc: peterz@infradead.org Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/8099075.V0LvN3pQAV@vostro.rjw.lan Signed-off-by: Ingo Molnar --- 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--;