From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752881AbbDCM5j (ORCPT ); Fri, 3 Apr 2015 08:57:39 -0400 Received: from v094114.home.net.pl ([79.96.170.134]:57433 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752393AbbDCM5f (ORCPT ); Fri, 3 Apr 2015 08:57:35 -0400 From: "Rafael J. Wysocki" To: peterz@infradead.org, mingo@kernel.org Cc: rafael.j.wysocki@intel.com, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, tglx@linutronix.de, david.vrabel@citrix.com, linux-kernel@vger.kernel.org, hpa@zytor.com, Linux PM list Subject: [PATCH][fix for tip/timers/core] timers / PM: Fix up tick_unfreeze() Date: Fri, 03 Apr 2015 15:21:51 +0200 Message-ID: <8099075.V0LvN3pQAV@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/3.19.0+; KDE/4.11.5; x86_64; ; ) In-Reply-To: References: <1698741.eezk9tnXtG@vostro.rjw.lan> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rafael J. Wysocki 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 --- kernel/time/tick-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux-pm/kernel/time/tick-common.c =================================================================== --- linux-pm.orig/kernel/time/tick-common.c +++ linux-pm/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--;