Merge branch 'nohz/printk-v8' into irq/core

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / kernel / irq_work.c

diff --git a/kernel/irq_work.c b/kernel/irq_work.c
index 7f3a59bc8e3d97660a8e75fdf6847fd4124f96c6..55fcce6065cf6bc3213829fd8188cae90b61b778 100644 (file)
--- a/kernel/irq_work.c
+++ b/kernel/irq_work.c
@@ -56,10 +56,18 @@ void __weak arch_irq_work_raise(void)
 }
 
 /*
- * Queue the entry and raise the IPI if needed.
+ * Enqueue the irq_work @entry unless it's already pending
+ * somewhere.
+ *
+ * Can be re-enqueued while the callback is still in progress.
  */
-static void __irq_work_queue(struct irq_work *work)
+void irq_work_queue(struct irq_work *work)
 {
+       /* Only queue if not already pending */
+       if (!irq_work_claim(work))
+               return;
+
+       /* Queue the entry and raise the IPI if needed. */
        preempt_disable();
 
        llist_add(&work->llnode, &__get_cpu_var(irq_work_list));
@@ -76,25 +84,6 @@ static void __irq_work_queue(struct irq_work *work)
 
        preempt_enable();
 }
-
-/*
- * Enqueue the irq_work @entry, returns true on success, failure when the
- * @entry was already enqueued by someone else.
- *
- * Can be re-enqueued while the callback is still in progress.
- */
-bool irq_work_queue(struct irq_work *work)
-{
-       if (!irq_work_claim(work)) {
-               /*
-                * Already enqueued, can't do!
-                */
-               return false;
-       }
-
-       __irq_work_queue(work);
-       return true;
-}
 EXPORT_SYMBOL_GPL(irq_work_queue);
 
 bool irq_work_needs_cpu(void)