[rt] Refresh "genirq: Handle missing work_struct in irq_set_affinity_notifier()" for context changes in 4.19.114
This commit is contained in:
parent
970c295c4d
commit
70cac4105f
|
@ -1626,6 +1626,8 @@ linux (4.19.115-1) UNRELEASED; urgency=medium
|
||||||
on RT" for context changes in 4.19.114
|
on RT" for context changes in 4.19.114
|
||||||
* [rt] Refresh "genirq: Do not invoke the affinity callback via a workqueue
|
* [rt] Refresh "genirq: Do not invoke the affinity callback via a workqueue
|
||||||
on RT" for context changes in 4.19.114
|
on RT" for context changes in 4.19.114
|
||||||
|
* [rt] Refresh "genirq: Handle missing work_struct in
|
||||||
|
irq_set_affinity_notifier()" for context changes in 4.19.114
|
||||||
|
|
||||||
[ Ben Hutchings ]
|
[ Ben Hutchings ]
|
||||||
* [x86] Drop "Add a SysRq option to lift kernel lockdown" (Closes: #947021)
|
* [x86] Drop "Add a SysRq option to lift kernel lockdown" (Closes: #947021)
|
||||||
|
|
|
@ -21,22 +21,23 @@ Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
|
||||||
kernel/irq/manage.c | 5 +++--
|
kernel/irq/manage.c | 5 +++--
|
||||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
|
|
||||||
index d5539e04e00a..290cd520dba1 100644
|
|
||||||
--- a/kernel/irq/manage.c
|
--- a/kernel/irq/manage.c
|
||||||
+++ b/kernel/irq/manage.c
|
+++ b/kernel/irq/manage.c
|
||||||
@@ -411,8 +411,9 @@ irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify)
|
@@ -415,13 +415,14 @@
|
||||||
raw_spin_unlock_irqrestore(&desc->lock, flags);
|
raw_spin_unlock_irqrestore(&desc->lock, flags);
|
||||||
|
|
||||||
if (old_notify) {
|
if (old_notify) {
|
||||||
-#ifndef CONFIG_PREEMPT_RT_BASE
|
-#ifndef CONFIG_PREEMPT_RT_BASE
|
||||||
- /* Need to address this for PREEMPT_RT */
|
- /* Need to address this for PREEMPT_RT */
|
||||||
+#ifdef CONFIG_PREEMPT_RT_BASE
|
+#ifdef CONFIG_PREEMPT_RT_BASE
|
||||||
+ kthread_cancel_work_sync(¬ify->work);
|
+ if (kthread_cancel_work_sync(¬ify->work)) {
|
||||||
+#else
|
+#else
|
||||||
cancel_work_sync(&old_notify->work);
|
if (cancel_work_sync(&old_notify->work)) {
|
||||||
#endif
|
+#endif
|
||||||
|
/* Pending work had a ref, put that one too */
|
||||||
kref_put(&old_notify->kref, old_notify->release);
|
kref_put(&old_notify->kref, old_notify->release);
|
||||||
--
|
}
|
||||||
2.25.1
|
-#endif
|
||||||
|
kref_put(&old_notify->kref, old_notify->release);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue