diff options
| author | Mark Brown <broonie@kernel.org> | 2018-05-30 11:04:19 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-05-30 11:04:19 +0100 |
| commit | d30fe0ff9c0c7edb2335da0ccb0a2fa2bb6d057e (patch) | |
| tree | 99a3b5721873f14f56e1f16eb51208ca4bb1361c | |
| parent | 37c0f71cf6f932adda4ab91c06644e93a9985ef0 (diff) | |
| parent | 3f39cdf309d8915d1286609cdc20837d3e565e5a (diff) | |
Merge tag 'v4.4.132-rt149' into linux-linaro-lsk-v4.4-rt
Linux 4.4.132-rt149
| -rw-r--r-- | include/linux/posix-timers.h | 2 | ||||
| -rw-r--r-- | kernel/time/alarmtimer.c | 2 | ||||
| -rw-r--r-- | kernel/time/posix-timers.c | 4 | ||||
| -rw-r--r-- | localversion-rt | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h index 907f3fd191ac..e2e43c61f6a1 100644 --- a/include/linux/posix-timers.h +++ b/include/linux/posix-timers.h @@ -92,8 +92,8 @@ struct k_itimer { struct alarm alarmtimer; ktime_t interval; } alarm; - struct rcu_head rcu; } it; + struct rcu_head rcu; }; struct k_clock { diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index 6fcc367ad531..9d5eac2c9275 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -392,7 +392,7 @@ int alarm_cancel(struct alarm *alarm) int ret = alarm_try_to_cancel(alarm); if (ret >= 0) return ret; - cpu_relax(); + hrtimer_wait_for_timer(&alarm->timer); } } EXPORT_SYMBOL_GPL(alarm_cancel); diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c index 48ca053dae2e..0808e2ae49bf 100644 --- a/kernel/time/posix-timers.c +++ b/kernel/time/posix-timers.c @@ -567,7 +567,7 @@ static struct k_itimer * alloc_posix_timer(void) static void k_itimer_rcu_free(struct rcu_head *head) { - struct k_itimer *tmr = container_of(head, struct k_itimer, it.rcu); + struct k_itimer *tmr = container_of(head, struct k_itimer, rcu); kmem_cache_free(posix_timers_cache, tmr); } @@ -584,7 +584,7 @@ static void release_posix_timer(struct k_itimer *tmr, int it_id_set) } put_pid(tmr->it_pid); sigqueue_free(tmr->sigq); - call_rcu(&tmr->it.rcu, k_itimer_rcu_free); + call_rcu(&tmr->rcu, k_itimer_rcu_free); } static struct k_clock *clockid_to_kclock(const clockid_t id) diff --git a/localversion-rt b/localversion-rt index d3fa072b6b43..cb119fad03c1 100644 --- a/localversion-rt +++ b/localversion-rt @@ -1 +1 @@ --rt147 +-rt149 |