diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-01-15 10:35:14 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-01-15 10:35:14 -0500 |
| commit | b17d1ce7efe21e075dace85658d26d354766b443 (patch) | |
| tree | 97bce6e52c417120c2ca9e5c09d966a6f49bbb22 | |
| parent | a4cffdad731447217701d3bc6da4587bbb4d2cbd (diff) | |
| parent | 93ad0fc088c5b4631f796c995bdd27a082ef33a6 (diff) | |
Merge branch 'timers/urgent' into timers/core
Merge urgent fix so depending cleanup patch can be applied.
| -rw-r--r-- | kernel/time/posix-cpu-timers.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c index 8f0644af40be..80f955210861 100644 --- a/kernel/time/posix-cpu-timers.c +++ b/kernel/time/posix-cpu-timers.c | |||
| @@ -685,6 +685,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags, | |||
| 685 | * set up the signal and overrun bookkeeping. | 685 | * set up the signal and overrun bookkeeping. |
| 686 | */ | 686 | */ |
| 687 | timer->it.cpu.incr = timespec64_to_ns(&new->it_interval); | 687 | timer->it.cpu.incr = timespec64_to_ns(&new->it_interval); |
| 688 | timer->it_interval = ns_to_ktime(timer->it.cpu.incr); | ||
| 688 | 689 | ||
| 689 | /* | 690 | /* |
| 690 | * This acts as a modification timestamp for the timer, | 691 | * This acts as a modification timestamp for the timer, |
