[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <8099075.V0LvN3pQAV@vostro.rjw.lan>
Date: Fri, 03 Apr 2015 15:21:51 +0200
From: "Rafael J. Wysocki" <rjw@...ysocki.net>
To: peterz@...radead.org, mingo@...nel.org
Cc: rafael.j.wysocki@...el.com, konrad.wilk@...cle.com,
boris.ostrovsky@...cle.com, tglx@...utronix.de,
david.vrabel@...rix.com, linux-kernel@...r.kernel.org,
hpa@...or.com, Linux PM list <linux-pm@...r.kernel.org>
Subject: [PATCH][fix for tip/timers/core] timers / PM: Fix up tick_unfreeze()
From: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
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@...el.com>
---
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--;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists