hrtimers: Avoid touching inactive timer bases

[mirror_ubuntu-bionic-kernel.git] / kernel / time / alarmtimer.c

diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index c6027fe9a4e6d5f853f71d694c894e874591072e..2d966244ea60d0a8dcf963e1052b2dbfbfcac76d 100644 (file)
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -494,7 +494,7 @@ static int update_rmtp(ktime_t exp, enum  alarmtimer_type type,
  */
 static long __sched alarm_timer_nsleep_restart(struct restart_block *restart)
 {
-       enum  alarmtimer_type type = restart->nanosleep.index;
+       enum  alarmtimer_type type = restart->nanosleep.clockid;
        ktime_t exp;
        struct timespec __user  *rmtp;
        struct alarm alarm;
@@ -573,7 +573,7 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags,
 
        restart = &current_thread_info()->restart_block;
        restart->fn = alarm_timer_nsleep_restart;
-       restart->nanosleep.index = type;
+       restart->nanosleep.clockid = type;
        restart->nanosleep.expires = exp.tv64;
        restart->nanosleep.rmtp = rmtp;
        ret = -ERESTART_RESTARTBLOCK;