diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-12-25 10:42:18 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-12-25 10:42:25 -0500 |
| commit | 34b54eb536dde6970e8b447806904d322fe5e74f (patch) | |
| tree | 6086b2d7b7b87499af3427b20bd77fe009a43eae | |
| parent | 0f74d56e484d148288ce3b51456caafe9a890208 (diff) | |
| download | 4.9-rt-patches-34b54eb536dde6970e8b447806904d322fe5e74f.tar.gz | |
sched: import refresh worker acct patch for schedstat upstream
| -rw-r--r-- | patches/workqueue-distangle-from-rq-lock.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/patches/workqueue-distangle-from-rq-lock.patch b/patches/workqueue-distangle-from-rq-lock.patch index 071360f3f93ca..ad9e7ee2ba5e0 100644 --- a/patches/workqueue-distangle-from-rq-lock.patch +++ b/patches/workqueue-distangle-from-rq-lock.patch @@ -31,7 +31,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -1701,10 +1701,6 @@ static inline void ttwu_activate(struct +@@ -1711,10 +1711,6 @@ static inline void ttwu_activate(struct { activate_task(rq, p, en_flags); p->on_rq = TASK_ON_RQ_QUEUED; @@ -42,12 +42,13 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> } /* -@@ -2143,53 +2139,6 @@ try_to_wake_up(struct task_struct *p, un +@@ -2152,53 +2148,6 @@ try_to_wake_up(struct task_struct *p, un } /** - * try_to_wake_up_local - try to wake up a local task with rq lock held - * @p: the thread to be awakened +- * @cookie: context's cookie for pinning - * - * Put @p on the run-queue if it's not already there. The caller must - * ensure that this_rq() is locked, @p is bound to this_rq() and not @@ -86,8 +87,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> - ttwu_activate(rq, p, ENQUEUE_WAKEUP); - - ttwu_do_wakeup(rq, p, 0, cookie); -- if (schedstat_enabled()) -- ttwu_stat(p, smp_processor_id(), 0); +- ttwu_stat(p, smp_processor_id(), 0); -out: - raw_spin_unlock(&p->pi_lock); -} @@ -96,7 +96,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> * wake_up_process - Wake up a specific process * @p: The process to be woken up. * -@@ -3499,21 +3448,6 @@ static void __sched notrace __schedule(b +@@ -3494,21 +3443,6 @@ static void __sched notrace __schedule(b } else { deactivate_task(rq, prev, DEQUEUE_SLEEP); prev->on_rq = 0; @@ -118,7 +118,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> } switch_count = &prev->nvcsw; } -@@ -3546,6 +3480,14 @@ static inline void sched_submit_work(str +@@ -3567,6 +3501,14 @@ static inline void sched_submit_work(str { if (!tsk->state || tsk_is_pi_blocked(tsk)) return; @@ -133,7 +133,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> /* * If we are going to sleep and we have plugged IO queued, * make sure to submit it to avoid deadlocks. -@@ -3554,6 +3496,12 @@ static inline void sched_submit_work(str +@@ -3575,6 +3517,12 @@ static inline void sched_submit_work(str blk_schedule_flush_plug(tsk); } @@ -146,7 +146,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> asmlinkage __visible void __sched schedule(void) { struct task_struct *tsk = current; -@@ -3564,6 +3512,7 @@ asmlinkage __visible void __sched schedu +@@ -3585,6 +3533,7 @@ asmlinkage __visible void __sched schedu __schedule(false); sched_preempt_enable_no_resched(); } while (need_resched()); |