summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0193-sched-Distangle-worker-accounting-from-rqlock.patch
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/patches-rt/0193-sched-Distangle-worker-accounting-from-rqlock.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches-rt/0193-sched-Distangle-worker-accounting-from-rqlock.patch b/debian/patches-rt/0193-sched-Distangle-worker-accounting-from-rqlock.patch
index d68e7c167..e71c1b480 100644
--- a/debian/patches-rt/0193-sched-Distangle-worker-accounting-from-rqlock.patch
+++ b/debian/patches-rt/0193-sched-Distangle-worker-accounting-from-rqlock.patch
@@ -1,7 +1,7 @@
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 22 Jun 2011 19:47:03 +0200
-Subject: [PATCH 193/353] sched: Distangle worker accounting from rqlock
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=f51bb16041ffffd9adf703fde1245e9afda898b9
+Subject: [PATCH 193/354] sched: Distangle worker accounting from rqlock
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=7d6a23596c58f6835f693f56efda15aedfe2e48b
The worker accounting for cpu bound workers is plugged into the core
scheduler code and the wakeup code. This is not a hard requirement and
@@ -169,10 +169,10 @@ index 4a714c92dff2..20585605b2ac 100644
EXPORT_SYMBOL(schedule);
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
-index 50b037b79101..7561ac884a3e 100644
+index a44e5c245276..21751b94b93a 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
-@@ -844,43 +844,32 @@ static void wake_up_worker(struct worker_pool *pool)
+@@ -847,43 +847,32 @@ static void wake_up_worker(struct worker_pool *pool)
}
/**
@@ -227,7 +227,7 @@ index 50b037b79101..7561ac884a3e 100644
struct worker_pool *pool;
/*
-@@ -889,13 +878,15 @@ struct task_struct *wq_worker_sleeping(struct task_struct *task)
+@@ -892,13 +881,15 @@ struct task_struct *wq_worker_sleeping(struct task_struct *task)
* checking NOT_RUNNING.
*/
if (worker->flags & WORKER_NOT_RUNNING)
@@ -247,7 +247,7 @@ index 50b037b79101..7561ac884a3e 100644
/*
* The counterpart of the following dec_and_test, implied mb,
-@@ -909,9 +900,12 @@ struct task_struct *wq_worker_sleeping(struct task_struct *task)
+@@ -912,9 +903,12 @@ struct task_struct *wq_worker_sleeping(struct task_struct *task)
* lock is safe.
*/
if (atomic_dec_and_test(&pool->nr_running) &&