drop queue-4.19/sched-core-don-t-skip-remote-tick-for-idle-cpus.patch

diff --git a/queue-4.19/sched-core-don-t-skip-remote-tick-for-idle-cpus.patch b/queue-4.19/sched-core-don-t-skip-remote-tick-for-idle-cpus.patch
deleted file mode 100644 (file)
index 7c333c4..0000000
--- a/queue-4.19/sched-core-don-t-skip-remote-tick-for-idle-cpus.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From fd0093b1996cb13fd4d215de7381bb603a3a59de Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 11 Jan 2020 04:53:38 -0500
-Subject: sched/core: Don't skip remote tick for idle CPUs
-
-From: Scott Wood <swood@redhat.com>
-
-[ Upstream commit 488603b815a7514c7009e6fc339d74ed4a30f343 ]
-
-This will be used in the next patch to get a loadavg update from
-nohz cpus.  The delta check is skipped because idle_sched_class
-doesn't update se.exec_start.
-
-Signed-off-by: Scott Wood <swood@redhat.com>
-Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-Link: https://lkml.kernel.org/r/1578736419-14628-2-git-send-email-swood@redhat.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- kernel/sched/core.c | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index 2befd2c4ce9e6..3c7e039eae9a1 100644
---- a/kernel/sched/core.c
-+++ b/kernel/sched/core.c
-@@ -3117,22 +3117,24 @@ static void sched_tick_remote(struct work_struct *work)
-        * statistics and checks timeslices in a time-independent way, regardless
-        * of when exactly it is running.
-        */
--      if (idle_cpu(cpu) || !tick_nohz_tick_stopped_cpu(cpu))
-+      if (!tick_nohz_tick_stopped_cpu(cpu))
-               goto out_requeue;
- 
-       rq_lock_irq(rq, &rf);
-       curr = rq->curr;
--      if (is_idle_task(curr) || cpu_is_offline(cpu))
-+      if (cpu_is_offline(cpu))
-               goto out_unlock;
- 
-       update_rq_clock(rq);
--      delta = rq_clock_task(rq) - curr->se.exec_start;
- 
--      /*
--       * Make sure the next tick runs within a reasonable
--       * amount of time.
--       */
--      WARN_ON_ONCE(delta > (u64)NSEC_PER_SEC * 3);
-+      if (!is_idle_task(curr)) {
-+              /*
-+               * Make sure the next tick runs within a reasonable
-+               * amount of time.
-+               */
-+              delta = rq_clock_task(rq) - curr->se.exec_start;
-+              WARN_ON_ONCE(delta > (u64)NSEC_PER_SEC * 3);
-+      }
-       curr->sched_class->task_tick(rq, curr, 0);
- 
- out_unlock:
--- 
-2.20.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 98bf631dae2fce1cdaec0d1549faee9a51107f75..e8162639a41e160b4950e6740acbc96cfb1624b7 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -2,7 +2,6 @@ irqchip-gic-v3-its-fix-misuse-of-genmask-macro.patch
 iwlwifi-pcie-fix-rb_allocator-workqueue-allocation.patch
 ipmi-ssif-handle-a-possible-null-pointer-reference.patch
 drm-msm-set-dma-maximum-segment-size-for-mdss.patch
-sched-core-don-t-skip-remote-tick-for-idle-cpus.patch
 dax-pass-nowait-flag-to-iomap_apply.patch
 mac80211-consider-more-elements-in-parsing-crc.patch
 cfg80211-check-wiphy-driver-existence-for-drvinfo-re.patch