refresh irqwork-Move-irq-safe-work-to-irq-context.patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/patches/irqwork-Move-irq-safe-work-to-irq-context.patch b/patches/irqwork-Move-irq-safe-work-to-irq-context.patch
index 3301b02..942a804 100644
--- a/patches/irqwork-Move-irq-safe-work-to-irq-context.patch
+++ b/patches/irqwork-Move-irq-safe-work-to-irq-context.patch
@@ -1,6 +1,7 @@
-Subject: irqwork: Move irq safe work to irq context
+From 862a6c0ccc672374fb0ab35fdacef9b9238667c5 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sun, 15 Nov 2015 18:40:17 +0100
+Subject: [PATCH] irqwork: Move irq safe work to irq context
On architectures where arch_irq_work_has_interrupt() returns false, we
end up running the irq safe work from the softirq context. That
@@ -14,15 +15,12 @@
Reported-and-tested-by: Yanjiang Jin <yanjiang.jin@windriver.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable-rt@vger.kernel.org
----
- include/linux/irq_work.h | 6 ++++++
- kernel/irq_work.c | 9 +++++++++
- kernel/time/timer.c | 6 ++----
- 3 files changed, 17 insertions(+), 4 deletions(-)
+diff --git a/include/linux/irq_work.h b/include/linux/irq_work.h
+index 0e427a9997f3..2543aab05daa 100644
--- a/include/linux/irq_work.h
+++ b/include/linux/irq_work.h
-@@ -52,4 +52,10 @@ static inline bool irq_work_needs_cpu(vo
+@@ -52,4 +52,10 @@ static inline bool irq_work_needs_cpu(void) { return false; }
static inline void irq_work_run(void) { }
#endif
@@ -33,6 +31,8 @@
+#endif
+
#endif /* _LINUX_IRQ_WORK_H */
+diff --git a/kernel/irq_work.c b/kernel/irq_work.c
+index 0ddaf1e66d8c..2899ba0d23d1 100644
--- a/kernel/irq_work.c
+++ b/kernel/irq_work.c
@@ -200,8 +200,17 @@ void irq_work_tick(void)
@@ -53,9 +53,11 @@
/*
* Synchronize against the irq_work @entry, ensures the entry is not
+diff --git a/kernel/time/timer.c b/kernel/time/timer.c
+index dc70267717f6..5c78f7f2beed 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
-@@ -1604,7 +1604,7 @@ void update_process_times(int user_tick)
+@@ -1623,7 +1623,7 @@ void update_process_times(int user_tick)
scheduler_tick();
run_local_timers();
rcu_check_callbacks(user_tick);
@@ -64,9 +66,9 @@
if (in_irq())
irq_work_tick();
#endif
-@@ -1645,9 +1645,7 @@ static __latent_entropy void run_timer_s
- {
- struct timer_base *base = this_cpu_ptr(&timer_bases[BASE_STD]);
+@@ -1677,9 +1677,7 @@ static __latent_entropy void run_timer_softirq(struct softirq_action *h)
+ */
+ base->must_forward_clk = false;
-#if defined(CONFIG_IRQ_WORK) && defined(CONFIG_PREEMPT_RT_FULL)
- irq_work_tick();
@@ -75,3 +77,6 @@
__run_timers(base);
if (IS_ENABLED(CONFIG_NO_HZ_COMMON) && base->nohz_active)
+--
+2.1.4
+
