diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-25 11:40:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-25 11:40:24 -0700 |
| commit | 32ae83ffec6373c226d177bdbbbb156962cc638e (patch) | |
| tree | 9da6febfa20c47a6ef1e034bd37f2f9ff143895e /arch/um/kernel/process.c | |
| parent | Merge tag 'for-linus-5.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | um: fix time travel mode (diff) | |
| download | linux-32ae83ffec6373c226d177bdbbbb156962cc638e.tar.gz linux-32ae83ffec6373c226d177bdbbbb156962cc638e.zip | |
Merge tag 'for-linus-5.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML fix from Richard Weinberger:
"Fix time travel mode"
* tag 'for-linus-5.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: fix time travel mode
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 |