diff options
Diffstat (limited to 'arch/um/kernel/time.c')
-rw-r--r-- | arch/um/kernel/time.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c index 6a051b078359..234757233355 100644 --- a/arch/um/kernel/time.c +++ b/arch/um/kernel/time.c | |||
@@ -50,7 +50,7 @@ void timer_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs) | |||
50 | static int itimer_shutdown(struct clock_event_device *evt) | 50 | static int itimer_shutdown(struct clock_event_device *evt) |
51 | { | 51 | { |
52 | if (time_travel_mode != TT_MODE_OFF) | 52 | if (time_travel_mode != TT_MODE_OFF) |
53 | time_travel_set_timer(TT_TMR_DISABLED, 0); | 53 | time_travel_set_timer_mode(TT_TMR_DISABLED); |
54 | 54 | ||
55 | if (time_travel_mode != TT_MODE_INFCPU) | 55 | if (time_travel_mode != TT_MODE_INFCPU) |
56 | os_timer_disable(); | 56 | os_timer_disable(); |
@@ -62,9 +62,10 @@ static int itimer_set_periodic(struct clock_event_device *evt) | |||
62 | { | 62 | { |
63 | unsigned long long interval = NSEC_PER_SEC / HZ; | 63 | unsigned long long interval = NSEC_PER_SEC / HZ; |
64 | 64 | ||
65 | if (time_travel_mode != TT_MODE_OFF) | 65 | if (time_travel_mode != TT_MODE_OFF) { |
66 | time_travel_set_timer(TT_TMR_PERIODIC, | 66 | time_travel_set_timer_mode(TT_TMR_PERIODIC); |
67 | time_travel_time + interval); | 67 | time_travel_set_timer_expiry(time_travel_time + interval); |
68 | } | ||
68 | 69 | ||
69 | if (time_travel_mode != TT_MODE_INFCPU) | 70 | if (time_travel_mode != TT_MODE_INFCPU) |
70 | os_timer_set_interval(interval); | 71 | os_timer_set_interval(interval); |
@@ -77,9 +78,10 @@ static int itimer_next_event(unsigned long delta, | |||
77 | { | 78 | { |
78 | delta += 1; | 79 | delta += 1; |
79 | 80 | ||
80 | if (time_travel_mode != TT_MODE_OFF) | 81 | if (time_travel_mode != TT_MODE_OFF) { |
81 | time_travel_set_timer(TT_TMR_ONESHOT, | 82 | time_travel_set_timer_mode(TT_TMR_ONESHOT); |
82 | time_travel_time + delta); | 83 | time_travel_set_timer_expiry(time_travel_time + delta); |
84 | } | ||
83 | 85 | ||
84 | if (time_travel_mode != TT_MODE_INFCPU) | 86 | if (time_travel_mode != TT_MODE_INFCPU) |
85 | return os_timer_one_shot(delta); | 87 | return os_timer_one_shot(delta); |