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/include/shared/timer-internal.h | |
| 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/include/shared/timer-internal.h')
| -rw-r--r-- | arch/um/include/shared/timer-internal.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/arch/um/include/shared/timer-internal.h b/arch/um/include/shared/timer-internal.h index 8574338bf23b..9991ec2371e4 100644 --- a/arch/um/include/shared/timer-internal.h +++ b/arch/um/include/shared/timer-internal.h @@ -34,10 +34,13 @@ static inline void time_travel_set_time(unsigned long long ns) time_travel_time = ns; } -static inline void time_travel_set_timer(enum time_travel_timer_mode mode, - unsigned long long expiry) +static inline void time_travel_set_timer_mode(enum time_travel_timer_mode mode) { time_travel_timer_mode = mode; +} + +static inline void time_travel_set_timer_expiry(unsigned long long expiry) +{ time_travel_timer_expiry = expiry; } #else @@ -50,8 +53,11 @@ static inline void time_travel_set_time(unsigned long long ns) { } -static inline void time_travel_set_timer(enum time_travel_timer_mode mode, - unsigned long long expiry) +static inline void time_travel_set_timer_mode(enum time_travel_timer_mode mode) +{ +} + +static inline void time_travel_set_timer_expiry(unsigned long long expiry) { } |