diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-04-28 13:45:31 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-04-28 13:45:31 -0400 |
| commit | 344284eab562fa69e9c0c0f45c79d7227f5f2858 (patch) | |
| tree | 05928aace65aef5390d34bb8e4752c646954c4db /kernel/time/tick-common.c | |
| parent | d26b2fc5c0474086af79d33554a133247e8e69c3 (diff) | |
| parent | 19bb613acb9ad8e57593cad5118acaee117cc303 (diff) | |
Merge tag 'v4.19.37' into v4.19-rt
This is the 4.19.37 stable release
Conflicts:
include/linux/sched/mm.h
kernel/sched/fair.c
Diffstat (limited to 'kernel/time/tick-common.c')
| -rw-r--r-- | kernel/time/tick-common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c index 7a87a4488a5e..32f5101f07ce 100644 --- a/kernel/time/tick-common.c +++ b/kernel/time/tick-common.c @@ -493,6 +493,7 @@ void tick_freeze(void) trace_suspend_resume(TPS("timekeeping_freeze"), smp_processor_id(), true); system_state = SYSTEM_SUSPEND; + sched_clock_suspend(); timekeeping_suspend(); } else { tick_suspend_local(); @@ -516,6 +517,7 @@ void tick_unfreeze(void) if (tick_freeze_depth == num_online_cpus()) { timekeeping_resume(); + sched_clock_resume(); system_state = SYSTEM_RUNNING; trace_suspend_resume(TPS("timekeeping_freeze"), smp_processor_id(), false); |