drop sched-fair-fix-runnable_avg_yn_inv-not-used-warnings.patch from 4.14 queue

diff --git a/queue-4.14/sched-fair-fix-runnable_avg_yn_inv-not-used-warnings.patch b/queue-4.14/sched-fair-fix-runnable_avg_yn_inv-not-used-warnings.patch
deleted file mode 100644 (file)
index 456de81..0000000
--- a/queue-4.14/sched-fair-fix-runnable_avg_yn_inv-not-used-warnings.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 7d82c7300ac16440d674c49fb631df5fc3772a11 Mon Sep 17 00:00:00 2001
-From: Qian Cai <cai@lca.pw>
-Date: Mon, 3 Jun 2019 17:11:44 -0400
-Subject: sched/fair: Fix "runnable_avg_yN_inv" not used warnings
-
-[ Upstream commit 509466b7d480bc5d22e90b9fbe6122ae0e2fbe39 ]
-
-runnable_avg_yN_inv[] is only used in kernel/sched/pelt.c but was
-included in several other places because they need other macros all
-came from kernel/sched/sched-pelt.h which was generated by
-Documentation/scheduler/sched-pelt. As the result, it causes compilation
-a lot of warnings,
-
-  kernel/sched/sched-pelt.h:4:18: warning: 'runnable_avg_yN_inv' defined but not used [-Wunused-const-variable=]
-  kernel/sched/sched-pelt.h:4:18: warning: 'runnable_avg_yN_inv' defined but not used [-Wunused-const-variable=]
-  kernel/sched/sched-pelt.h:4:18: warning: 'runnable_avg_yN_inv' defined but not used [-Wunused-const-variable=]
-  ...
-
-Silence it by appending the __maybe_unused attribute for it, so all
-generated variables and macros can still be kept in the same file.
-
-Signed-off-by: Qian Cai <cai@lca.pw>
-Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Link: https://lkml.kernel.org/r/1559596304-31581-1-git-send-email-cai@lca.pw
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- Documentation/scheduler/sched-pelt.c | 3 ++-
- kernel/sched/sched-pelt.h            | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Documentation/scheduler/sched-pelt.c b/Documentation/scheduler/sched-pelt.c
-index e4219139386a..7238b355919c 100644
---- a/Documentation/scheduler/sched-pelt.c
-+++ b/Documentation/scheduler/sched-pelt.c
-@@ -20,7 +20,8 @@ void calc_runnable_avg_yN_inv(void)
-       int i;
-       unsigned int x;
- 
--      printf("static const u32 runnable_avg_yN_inv[] = {");
-+      /* To silence -Wunused-but-set-variable warnings. */
-+      printf("static const u32 runnable_avg_yN_inv[] __maybe_unused = {");
-       for (i = 0; i < HALFLIFE; i++) {
-               x = ((1UL<<32)-1)*pow(y, i);
- 
-diff --git a/kernel/sched/sched-pelt.h b/kernel/sched/sched-pelt.h
-index a26473674fb7..c529706bed11 100644
---- a/kernel/sched/sched-pelt.h
-+++ b/kernel/sched/sched-pelt.h
-@@ -1,7 +1,7 @@
- /* SPDX-License-Identifier: GPL-2.0 */
- /* Generated by Documentation/scheduler/sched-pelt; do not modify. */
- 
--static const u32 runnable_avg_yN_inv[] = {
-+static const u32 runnable_avg_yN_inv[] __maybe_unused = {
-       0xffffffff, 0xfa83b2da, 0xf5257d14, 0xefe4b99a, 0xeac0c6e6, 0xe5b906e6,
-       0xe0ccdeeb, 0xdbfbb796, 0xd744fcc9, 0xd2a81d91, 0xce248c14, 0xc9b9bd85,
-       0xc5672a10, 0xc12c4cc9, 0xbd08a39e, 0xb8fbaf46, 0xb504f333, 0xb123f581,
--- 
-2.20.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index 9a57be70fb8e2526b3228db1fe5a01ef018533ac..ae4b5b03829cca02358eb66c995526efc717eb9a 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -51,7 +51,6 @@ x86-cpufeatures-add-fdp_excptn_only-and-zero_fcs_fds.patch
 blkcg-writeback-dead-memcgs-shouldn-t-contribute-to-.patch
 xfrm-fix-sa-selector-validation.patch
 sched-core-add-__sched-tag-for-io_schedule.patch
-sched-fair-fix-runnable_avg_yn_inv-not-used-warnings.patch
 x86-atomic-fix-smp_mb__-before-after-_atomic.patch
 perf-evsel-make-perf_evsel__name-accept-a-null-argum.patch
 vhost_net-disable-zerocopy-by-default.patch