diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2019-07-22 09:12:56 +0200 |
|---|---|---|
| committer |   Richard Weinberger <richard@nod.at> | 2019-08-23 00:39:53 +0200 |
| commit | e0917f879536cbf57367429d084775d8224c986c (patch) | |
| tree | 01628bcac02fd84399a5008bcdf40615f326a187 /arch/um/kernel/process.c | |
| parent | Linux 5.3-rc5 (diff) | |
| download | linux-dev-e0917f879536cbf57367429d084775d8224c986c.tar.xz linux-dev-e0917f879536cbf57367429d084775d8224c986c.zip | |
um: fix time travel mode
Unfortunately, my build fix for when time travel mode isn't
enabled broke time travel mode, because I forgot that we need
to use the timer time after the timer has been marked disabled,
and thus need to leave the time stored instead of zeroing it.
Fix that by splitting the inline into two, so we can call only
the _mode() one in the relevant code path.
Fixes: b482e48d29f1 ("um: fix build without CONFIG_UML_TIME_TRAVEL_SUPPORT")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/kernel/process.c')
| -rw-r--r-- | arch/um/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index 67c0d1a860e9..6bede7888fc2 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c @@ -213,7 +213,7 @@ static void time_travel_sleep(unsigned long long duration) if (time_travel_timer_mode != TT_TMR_DISABLED || time_travel_timer_expiry < next) { if (time_travel_timer_mode == TT_TMR_ONESHOT) - time_travel_set_timer(TT_TMR_DISABLED, 0); + time_travel_set_timer_mode(TT_TMR_DISABLED); /* * time_travel_time will be adjusted in the timer * IRQ handler so it works even when the signal |