diff options
Diffstat (limited to 'patches/hrtimers-prepare-full-preemption.patch')
| -rw-r--r-- | patches/hrtimers-prepare-full-preemption.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/patches/hrtimers-prepare-full-preemption.patch b/patches/hrtimers-prepare-full-preemption.patch index e9838c7bb602..7bf4bd2955fc 100644 --- a/patches/hrtimers-prepare-full-preemption.patch +++ b/patches/hrtimers-prepare-full-preemption.patch @@ -173,7 +173,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> expires = timeval_to_ktime(value->it_value); --- a/kernel/time/posix-timers.c +++ b/kernel/time/posix-timers.c -@@ -466,7 +466,7 @@ static struct k_itimer * alloc_posix_tim +@@ -463,7 +463,7 @@ static struct k_itimer * alloc_posix_tim static void k_itimer_rcu_free(struct rcu_head *head) { @@ -182,7 +182,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kmem_cache_free(posix_timers_cache, tmr); } -@@ -483,7 +483,7 @@ static void release_posix_timer(struct k +@@ -480,7 +480,7 @@ static void release_posix_timer(struct k } put_pid(tmr->it_pid); sigqueue_free(tmr->sigq); @@ -191,7 +191,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> } static int common_timer_create(struct k_itimer *new_timer) -@@ -824,6 +824,22 @@ static void common_hrtimer_arm(struct k_ +@@ -821,6 +821,22 @@ static void common_hrtimer_arm(struct k_ hrtimer_start_expires(timer, HRTIMER_MODE_ABS); } @@ -214,7 +214,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> static int common_hrtimer_try_to_cancel(struct k_itimer *timr) { return hrtimer_try_to_cancel(&timr->it.real.timer); -@@ -888,6 +904,7 @@ static int do_timer_settime(timer_t time +@@ -885,6 +901,7 @@ static int do_timer_settime(timer_t time if (!timr) return -EINVAL; @@ -222,7 +222,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kc = timr->kclock; if (WARN_ON_ONCE(!kc || !kc->timer_set)) error = -EINVAL; -@@ -896,9 +913,12 @@ static int do_timer_settime(timer_t time +@@ -893,9 +910,12 @@ static int do_timer_settime(timer_t time unlock_timer(timr, flag); if (error == TIMER_RETRY) { @@ -235,7 +235,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> return error; } -@@ -980,10 +1000,15 @@ SYSCALL_DEFINE1(timer_delete, timer_t, t +@@ -977,10 +997,15 @@ SYSCALL_DEFINE1(timer_delete, timer_t, t if (!timer) return -EINVAL; @@ -251,7 +251,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> spin_lock(¤t->sighand->siglock); list_del(&timer->list); -@@ -1009,8 +1034,18 @@ static void itimer_delete(struct k_itime +@@ -1006,8 +1031,18 @@ static void itimer_delete(struct k_itime retry_delete: spin_lock_irqsave(&timer->it_lock, flags); |