diff options
| -rw-r--r-- | patches/io_wq-Make-io_wqe-lock-a-raw_spinlock_t.patch | 9 | ||||
| -rw-r--r-- | patches/localversion.patch | 2 | ||||
| -rw-r--r-- | patches/lockdep-no-softirq-accounting-on-rt.patch | 6 |
3 files changed, 8 insertions, 9 deletions
diff --git a/patches/io_wq-Make-io_wqe-lock-a-raw_spinlock_t.patch b/patches/io_wq-Make-io_wqe-lock-a-raw_spinlock_t.patch index 426dedd236d8..d4f2445cf646 100644 --- a/patches/io_wq-Make-io_wqe-lock-a-raw_spinlock_t.patch +++ b/patches/io_wq-Make-io_wqe-lock-a-raw_spinlock_t.patch @@ -208,7 +208,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> if ((work_flags & IO_WQ_WORK_CONCURRENT) || !atomic_read(&acct->nr_running)) -@@ -933,14 +933,14 @@ static void io_wqe_cancel_pending_work(s +@@ -951,13 +951,13 @@ static void io_wqe_cancel_pending_work(s unsigned long flags; retry: @@ -218,14 +218,13 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> work = container_of(node, struct io_wq_work, list); if (!match->fn(work, match->data)) continue; - - wq_list_del(&wqe->work_list, node, prev); + io_wqe_remove_pending(wqe, work, prev); - spin_unlock_irqrestore(&wqe->lock, flags); + raw_spin_unlock_irqrestore(&wqe->lock, flags); io_run_cancel(work, wqe); match->nr_pending++; if (!match->cancel_all) -@@ -949,7 +949,7 @@ static void io_wqe_cancel_pending_work(s +@@ -966,7 +966,7 @@ static void io_wqe_cancel_pending_work(s /* not safe to continue after unlock */ goto retry; } @@ -234,7 +233,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> } static void io_wqe_cancel_running_work(struct io_wqe *wqe, -@@ -1057,7 +1057,7 @@ struct io_wq *io_wq_create(unsigned boun +@@ -1074,7 +1074,7 @@ struct io_wq *io_wq_create(unsigned boun } atomic_set(&wqe->acct[IO_WQ_ACCT_UNBOUND].nr_running, 0); wqe->wq = wq; diff --git a/patches/localversion.patch b/patches/localversion.patch index a02382e6df70..279489a1d145 100644 --- a/patches/localversion.patch +++ b/patches/localversion.patch @@ -10,4 +10,4 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- /dev/null +++ b/localversion-rt @@ -0,0 +1 @@ -+-rt1 ++-rt2 diff --git a/patches/lockdep-no-softirq-accounting-on-rt.patch b/patches/lockdep-no-softirq-accounting-on-rt.patch index 2758d1701d03..3c8c0596cbf0 100644 --- a/patches/lockdep-no-softirq-accounting-on-rt.patch +++ b/patches/lockdep-no-softirq-accounting-on-rt.patch @@ -12,9 +12,9 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- a/include/linux/irqflags.h +++ b/include/linux/irqflags.h -@@ -70,14 +70,6 @@ do { \ +@@ -71,14 +71,6 @@ do { \ do { \ - this_cpu_dec(hardirq_context); \ + __this_cpu_dec(hardirq_context); \ } while (0) -# define lockdep_softirq_enter() \ -do { \ @@ -27,7 +27,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> # define lockdep_hrtimer_enter(__hrtimer) \ ({ \ -@@ -139,6 +131,21 @@ do { \ +@@ -140,6 +132,21 @@ do { \ # define lockdep_irq_work_exit(__work) do { } while (0) #endif |