diff options
Diffstat (limited to 'debian/patches-rt/hrtimer-consolidate-hrtimer_init-hrtimer_init_sleepe.patch')
| -rw-r--r-- | debian/patches-rt/hrtimer-consolidate-hrtimer_init-hrtimer_init_sleepe.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/debian/patches-rt/hrtimer-consolidate-hrtimer_init-hrtimer_init_sleepe.patch b/debian/patches-rt/hrtimer-consolidate-hrtimer_init-hrtimer_init_sleepe.patch index 820f7fe1c..dd5f95947 100644 --- a/debian/patches-rt/hrtimer-consolidate-hrtimer_init-hrtimer_init_sleepe.patch +++ b/debian/patches-rt/hrtimer-consolidate-hrtimer_init-hrtimer_init_sleepe.patch @@ -1,7 +1,7 @@ From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Tue, 3 Jul 2018 11:25:41 +0200 Subject: [PATCH v2] hrtimer: consolidate hrtimer_init() + hrtimer_init_sleeper() calls -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.0/older/patches-5.0.10-rt7.tar.xz +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.2/older/patches-5.2-rt1.tar.xz hrtimer_init_sleeper() calls require a prior initialisation of the hrtimer object with hrtimer_init(). Lets make the initialisation of @@ -27,7 +27,7 @@ Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de> --- a/block/blk-mq.c +++ b/block/blk-mq.c -@@ -3377,10 +3377,9 @@ static bool blk_mq_poll_hybrid_sleep(str +@@ -3425,10 +3425,9 @@ static bool blk_mq_poll_hybrid_sleep(str kt = nsecs; mode = HRTIMER_MODE_REL; @@ -58,7 +58,7 @@ Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de> while (1) { --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h -@@ -361,10 +361,17 @@ DECLARE_PER_CPU(struct tick_device, tick +@@ -364,10 +364,17 @@ DECLARE_PER_CPU(struct tick_device, tick /* Initialize timers: */ extern void hrtimer_init(struct hrtimer *timer, clockid_t which_clock, enum hrtimer_mode mode); @@ -76,7 +76,7 @@ Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de> extern void destroy_hrtimer_on_stack(struct hrtimer *timer); #else -@@ -374,6 +381,15 @@ static inline void hrtimer_init_on_stack +@@ -377,6 +384,15 @@ static inline void hrtimer_init_on_stack { hrtimer_init(timer, which_clock, mode); } @@ -92,7 +92,7 @@ Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de> static inline void destroy_hrtimer_on_stack(struct hrtimer *timer) { } #endif -@@ -477,9 +493,6 @@ extern long hrtimer_nanosleep(const stru +@@ -481,9 +497,6 @@ extern long hrtimer_nanosleep(const stru const enum hrtimer_mode mode, const clockid_t clockid); @@ -117,7 +117,7 @@ Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de> current->timer_slack_ns, \ --- a/kernel/futex.c +++ b/kernel/futex.c -@@ -2692,10 +2692,9 @@ static int futex_wait(u32 __user *uaddr, +@@ -2722,10 +2722,9 @@ static int futex_wait(u32 __user *uaddr, if (abs_time) { to = &timeout; @@ -131,7 +131,7 @@ Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de> hrtimer_set_expires_range_ns(&to->timer, *abs_time, current->timer_slack_ns); } -@@ -2794,9 +2793,8 @@ static int futex_lock_pi(u32 __user *uad +@@ -2824,9 +2823,8 @@ static int futex_lock_pi(u32 __user *uad if (time) { to = &timeout; @@ -143,7 +143,7 @@ Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de> hrtimer_set_expires(&to->timer, *time); } -@@ -3219,10 +3217,9 @@ static int futex_wait_requeue_pi(u32 __u +@@ -3244,10 +3242,9 @@ static int futex_wait_requeue_pi(u32 __u if (abs_time) { to = &timeout; @@ -159,7 +159,7 @@ Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de> } --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c -@@ -1639,13 +1639,44 @@ static enum hrtimer_restart hrtimer_wake +@@ -1651,13 +1651,44 @@ static enum hrtimer_restart hrtimer_wake return HRTIMER_NORESTART; } @@ -205,7 +205,7 @@ Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de> int nanosleep_copyout(struct restart_block *restart, struct timespec64 *ts) { switch(restart->nanosleep.type) { -@@ -1669,8 +1700,6 @@ static int __sched do_nanosleep(struct h +@@ -1681,8 +1712,6 @@ static int __sched do_nanosleep(struct h { struct restart_block *restart; @@ -214,7 +214,7 @@ Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de> do { set_current_state(TASK_INTERRUPTIBLE); hrtimer_start_expires(&t->timer, mode); -@@ -1707,10 +1736,9 @@ static long __sched hrtimer_nanosleep_re +@@ -1719,10 +1748,9 @@ static long __sched hrtimer_nanosleep_re struct hrtimer_sleeper t; int ret; @@ -227,7 +227,7 @@ Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de> ret = do_nanosleep(&t, HRTIMER_MODE_ABS); destroy_hrtimer_on_stack(&t.timer); return ret; -@@ -1728,7 +1756,7 @@ long hrtimer_nanosleep(const struct time +@@ -1740,7 +1768,7 @@ long hrtimer_nanosleep(const struct time if (dl_task(current) || rt_task(current)) slack = 0; @@ -236,7 +236,7 @@ Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de> hrtimer_set_expires_range_ns(&t.timer, timespec64_to_ktime(*rqtp), slack); ret = do_nanosleep(&t, mode); if (ret != -ERESTART_RESTARTBLOCK) -@@ -1927,11 +1955,9 @@ schedule_hrtimeout_range_clock(ktime_t * +@@ -1940,11 +1968,9 @@ schedule_hrtimeout_range_clock(ktime_t * return -EINTR; } @@ -251,7 +251,7 @@ Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de> if (likely(t.task)) --- a/net/core/pktgen.c +++ b/net/core/pktgen.c -@@ -2160,7 +2160,8 @@ static void spin(struct pktgen_dev *pkt_ +@@ -2154,7 +2154,8 @@ static void spin(struct pktgen_dev *pkt_ s64 remaining; struct hrtimer_sleeper t; @@ -261,7 +261,7 @@ Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de> hrtimer_set_expires(&t.timer, spin_until); remaining = ktime_to_ns(hrtimer_expires_remaining(&t.timer)); -@@ -2175,7 +2176,6 @@ static void spin(struct pktgen_dev *pkt_ +@@ -2169,7 +2170,6 @@ static void spin(struct pktgen_dev *pkt_ } while (ktime_compare(end_time, spin_until) < 0); } else { /* see do_nanosleep */ |