[PATCH] genirq: don't use flush_scheduled_work() in IRQ affinitynotifiers

[Tejun Heo]

cd7eab44e9 (genirq: Add IRQ affinity notifiers) added use of
flush_scheduled_work() which is being deprecated.  Add a dedicated
workqueue and flush it instead of flushing system-wide workqueue.

Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
---
I'm planning on marking flush_scheduled_work() deprecated in
linux-next soonish.  It would be great if this patch (or something
else which removes flush_scheduled_work() call somehow) can be
included in linux-next.

Thanks.

 include/linux/interrupt.h |    6 +-----
 kernel/irq/manage.c       |   17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 6 deletions(-)

Index: work/include/linux/interrupt.h
===================================================================
--- work.orig/include/linux/interrupt.h
+++ work/include/linux/interrupt.h
@@ -256,11 +256,7 @@ struct irq_affinity_notify {
 
 extern int
 irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify);
-
-static inline void irq_run_affinity_notifiers(void)
-{
-	flush_scheduled_work();
-}
+extern void irq_run_affinity_notifiers(void);
 
 #else /* CONFIG_SMP */
 
Index: work/kernel/irq/manage.c
===================================================================
--- work.orig/kernel/irq/manage.c
+++ work/kernel/irq/manage.c
@@ -74,6 +74,16 @@ EXPORT_SYMBOL(synchronize_irq);
 
 #ifdef CONFIG_SMP
 cpumask_var_t irq_default_affinity;
+static struct workqueue_struct *irq_affinity_notify_wq;
+
+static int __init irq_affinity_init(void)
+{
+	irq_affinity_notify_wq = alloc_workqueue("irq_affinity_notify", 0, 0);
+	if (!irq_affinity_notify_wq)
+		return -ENOMEM;
+	return 0;
+}
+subsys_initcall(irq_affinity_init);
 
 /**
  *	irq_can_set_affinity - Check if the affinity of a given irq can be set
@@ -164,7 +174,7 @@ int __irq_set_affinity_locked(struct irq
 
 	if (desc->affinity_notify) {
 		kref_get(&desc->affinity_notify->kref);
-		schedule_work(&desc->affinity_notify->work);
+		queue_work(irq_affinity_notify_wq, &desc->affinity_notify->work);
 	}
 	irqd_set(data, IRQD_AFFINITY_SET);
 
@@ -273,6 +283,11 @@ irq_set_affinity_notifier(unsigned int i
 }
 EXPORT_SYMBOL_GPL(irq_set_affinity_notifier);
 
+void irq_run_affinity_notifiers(void)
+{
+	flush_workqueue(irq_affinity_notify_wq);
+}
+
 #ifndef CONFIG_AUTO_IRQ_AFFINITY
 /*
  * Generic version of the affinity autoselector.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/