um: fix build without CONFIG_UML_TIME_TRAVEL_SUPPORT

When CONFIG_UML_TIME_TRAVEL_SUPPORT isn't set, the build was broken.
Fix this.

Fixes: 065038706f77 ("um: Support time travel mode")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Richard Weinberger <richard@nod.at>

diff --git a/arch/um/include/shared/timer-internal.h b/arch/um/include/shared/timer-internal.h
index 5ca74f415d5273bba503dd289741a07227c5a568..8574338bf23ba48394fd40a49a564bf11969868e 100644 (file)
--- a/arch/um/include/shared/timer-internal.h
+++ b/arch/um/include/shared/timer-internal.h
@@ -54,6 +54,8 @@ static inline void time_travel_set_timer(enum time_travel_timer_mode mode,
                                         unsigned long long expiry)
 {
 }
+
+#define time_travel_timer_mode TT_TMR_DISABLED
 #endif
 
 #endif

diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index def2091697caf89df44722d21e20e56fd5476ae1..67c0d1a860e980d97ecb6d6bbf7cb349699edbfc 100644 (file)
--- 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_timer_mode = TT_TMR_DISABLED;
+                       time_travel_set_timer(TT_TMR_DISABLED, 0);
                /*
                 * time_travel_time will be adjusted in the timer
                 * IRQ handler so it works even when the signal