summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2018-05-29 17:44:24 +0200
committerSebastian Andrzej Siewior <bigeasy@linutronix.de>2018-05-29 17:46:37 +0200
commitec7ff06b919647a2fd7d2761a26f5a1d465e819c (patch)
tree79151dc1f8924fe038041c24dd05ddc39ecaa6dd /kernel
parenta79b5808cc112514b0e2a0304ee121f659ef16d9 (diff)
downloadlinux-rt-ec7ff06b919647a2fd7d2761a26f5a1d465e819c.tar.gz
PM / suspend: Prevent might sleep splats (updated)
This is an updated version of this patch which was merged upstream as commit c1a957d17086d20d52d7f9c8dffaeac2ee09d6f9 Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/time/tick-common.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index 7f5a26c3a8ee..7a87a4488a5e 100644
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@ -492,6 +492,7 @@ void tick_freeze(void)
if (tick_freeze_depth == num_online_cpus()) {
trace_suspend_resume(TPS("timekeeping_freeze"),
smp_processor_id(), true);
+ system_state = SYSTEM_SUSPEND;
timekeeping_suspend();
} else {
tick_suspend_local();
@@ -515,6 +516,7 @@ void tick_unfreeze(void)
if (tick_freeze_depth == num_online_cpus()) {
timekeeping_resume();
+ system_state = SYSTEM_RUNNING;
trace_suspend_resume(TPS("timekeeping_freeze"),
smp_processor_id(), false);
} else {