Messages in this thread Patch in this message |  | | From | "Rafael J. Wysocki" <> | Subject | [PATCH][fix for tip/timers/core] timers / PM: Fix up tick_unfreeze() | Date | Fri, 03 Apr 2015 15:21:51 +0200 |
| |
From: Rafael J. Wysocki <rafael.j.wysocki@intel.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@intel.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--;
|  |