summaryrefslogtreecommitdiff
path: root/patches/workqueue-use-locallock.patch
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2016-05-06 11:45:16 +0200
committerSebastian Andrzej Siewior <bigeasy@linutronix.de>2016-05-06 11:45:16 +0200
commita52e3317edc58fd536845127ccd9e2e4174261d3 (patch)
tree65bb2b4f62669b578d6826996c71bd01e2e42548 /patches/workqueue-use-locallock.patch
parent67e59dd0c366160e17d4fd773b848394173c30a2 (diff)
downloadlinux-rt-a52e3317edc58fd536845127ccd9e2e4174261d3.tar.gz
[ANNOUNCE] 4.4.9-rt17v4.4.9-rt17-patches
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Diffstat (limited to 'patches/workqueue-use-locallock.patch')
-rw-r--r--patches/workqueue-use-locallock.patch20
1 files changed, 10 insertions, 10 deletions
diff --git a/patches/workqueue-use-locallock.patch b/patches/workqueue-use-locallock.patch
index 44df5c5dedda..34761ce1f341 100644
--- a/patches/workqueue-use-locallock.patch
+++ b/patches/workqueue-use-locallock.patch
@@ -29,7 +29,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
static int worker_thread(void *__worker);
static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
-@@ -1082,9 +1085,9 @@ static void put_pwq_unlocked(struct pool
+@@ -1111,9 +1114,9 @@ static void put_pwq_unlocked(struct pool
* As both pwqs and pools are RCU protected, the
* following lock operations are safe.
*/
@@ -41,7 +41,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
}
}
-@@ -1186,7 +1189,7 @@ static int try_to_grab_pending(struct wo
+@@ -1215,7 +1218,7 @@ static int try_to_grab_pending(struct wo
struct worker_pool *pool;
struct pool_workqueue *pwq;
@@ -50,7 +50,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
/* try to steal the timer if it exists */
if (is_dwork) {
-@@ -1250,7 +1253,7 @@ static int try_to_grab_pending(struct wo
+@@ -1279,7 +1282,7 @@ static int try_to_grab_pending(struct wo
spin_unlock(&pool->lock);
fail:
rcu_read_unlock();
@@ -59,7 +59,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
if (work_is_canceling(work))
return -ENOENT;
cpu_relax();
-@@ -1322,7 +1325,7 @@ static void __queue_work(int cpu, struct
+@@ -1351,7 +1354,7 @@ static void __queue_work(int cpu, struct
* queued or lose PENDING. Grabbing PENDING and queueing should
* happen with IRQ disabled.
*/
@@ -68,7 +68,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
debug_work_activate(work);
-@@ -1427,14 +1430,14 @@ bool queue_work_on(int cpu, struct workq
+@@ -1456,14 +1459,14 @@ bool queue_work_on(int cpu, struct workq
bool ret = false;
unsigned long flags;
@@ -85,7 +85,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
return ret;
}
EXPORT_SYMBOL(queue_work_on);
-@@ -1501,14 +1504,14 @@ bool queue_delayed_work_on(int cpu, stru
+@@ -1530,14 +1533,14 @@ bool queue_delayed_work_on(int cpu, stru
unsigned long flags;
/* read the comment in __queue_work() */
@@ -102,7 +102,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
return ret;
}
EXPORT_SYMBOL(queue_delayed_work_on);
-@@ -1543,7 +1546,7 @@ bool mod_delayed_work_on(int cpu, struct
+@@ -1572,7 +1575,7 @@ bool mod_delayed_work_on(int cpu, struct
if (likely(ret >= 0)) {
__queue_delayed_work(cpu, wq, dwork, delay);
@@ -111,7 +111,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
}
/* -ENOENT from try_to_grab_pending() becomes %true */
-@@ -2817,7 +2820,7 @@ static bool __cancel_work_timer(struct w
+@@ -2846,7 +2849,7 @@ static bool __cancel_work_timer(struct w
/* tell other tasks trying to grab @work to back off */
mark_work_canceling(work);
@@ -120,7 +120,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
flush_work(work);
clear_work_data(work);
-@@ -2872,10 +2875,10 @@ EXPORT_SYMBOL_GPL(cancel_work_sync);
+@@ -2901,10 +2904,10 @@ EXPORT_SYMBOL_GPL(cancel_work_sync);
*/
bool flush_delayed_work(struct delayed_work *dwork)
{
@@ -133,7 +133,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
return flush_work(&dwork->work);
}
EXPORT_SYMBOL(flush_delayed_work);
-@@ -2910,7 +2913,7 @@ bool cancel_delayed_work(struct delayed_
+@@ -2939,7 +2942,7 @@ bool cancel_delayed_work(struct delayed_
set_work_pool_and_clear_pending(&dwork->work,
get_work_pool_id(&dwork->work));