From 8ec3b74b20af46b732df8c40c083c8a7f180ee8c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 14 Sep 2024 09:32:32 +0200 Subject: [PATCH] 4.19-stable patches added patches: selftests-kcmp-remove-call-to-ksft_set_plan.patch selftests-vm-remove-call-to-ksft_set_plan.patch --- ...ts-kcmp-remove-call-to-ksft_set_plan.patch | 32 ++++++++++++++++++ ...ests-vm-remove-call-to-ksft_set_plan.patch | 33 +++++++++++++++++++ queue-4.19/series | 2 ++ 3 files changed, 67 insertions(+) create mode 100644 queue-4.19/selftests-kcmp-remove-call-to-ksft_set_plan.patch create mode 100644 queue-4.19/selftests-vm-remove-call-to-ksft_set_plan.patch diff --git a/queue-4.19/selftests-kcmp-remove-call-to-ksft_set_plan.patch b/queue-4.19/selftests-kcmp-remove-call-to-ksft_set_plan.patch new file mode 100644 index 00000000000..61d568401a9 --- /dev/null +++ b/queue-4.19/selftests-kcmp-remove-call-to-ksft_set_plan.patch @@ -0,0 +1,32 @@ +From stable+bounces-76111-greg=kroah.com@vger.kernel.org Fri Sep 13 22:03:33 2024 +From: Samasth Norway Ananda +Date: Fri, 13 Sep 2024 13:02:40 -0700 +Subject: selftests/kcmp: remove call to ksft_set_plan() +To: stable@vger.kernel.org +Cc: gautammenghani201@gmail.com, skhan@linuxfoundation.org, usama.anjum@collabora.com, saeed.mirzamohammadi@oracle.com, samasth.norway.ananda@oracle.com +Message-ID: <20240913200249.4060165-3-samasth.norway.ananda@oracle.com> + +From: Samasth Norway Ananda + +The function definition for ksft_set_plan() is not present in linux-4.19.y. +kcmp_test selftest fails to compile because of this. + +Fixes: 32b0469d13eb ("selftests/kcmp: Make the test output consistent and clear") +Signed-off-by: Samasth Norway Ananda +Acked-by: Shuah Khan +Reviewed-by: Saeed Mirzamohammadi +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/kcmp/kcmp_test.c | 1 - + 1 file changed, 1 deletion(-) + +--- a/tools/testing/selftests/kcmp/kcmp_test.c ++++ b/tools/testing/selftests/kcmp/kcmp_test.c +@@ -89,7 +89,6 @@ int main(int argc, char **argv) + int ret; + + ksft_print_header(); +- ksft_set_plan(3); + + fd2 = open(kpath, O_RDWR); + if (fd2 < 0) { diff --git a/queue-4.19/selftests-vm-remove-call-to-ksft_set_plan.patch b/queue-4.19/selftests-vm-remove-call-to-ksft_set_plan.patch new file mode 100644 index 00000000000..ae8faf6008d --- /dev/null +++ b/queue-4.19/selftests-vm-remove-call-to-ksft_set_plan.patch @@ -0,0 +1,33 @@ +From stable+bounces-76110-greg=kroah.com@vger.kernel.org Fri Sep 13 22:03:33 2024 +From: Samasth Norway Ananda +Date: Fri, 13 Sep 2024 13:02:39 -0700 +Subject: selftests/vm: remove call to ksft_set_plan() +To: stable@vger.kernel.org +Cc: gautammenghani201@gmail.com, skhan@linuxfoundation.org, usama.anjum@collabora.com, saeed.mirzamohammadi@oracle.com, samasth.norway.ananda@oracle.com +Message-ID: <20240913200249.4060165-2-samasth.norway.ananda@oracle.com> + +From: Samasth Norway Ananda + +The function definition for ksft_set_plan() is not present in linux-4.19.y. +compaction_test selftest fails to compile because of this. + +Fixes: 9a21701edc41 ("selftests/mm: conform test to TAP format output") +Signed-off-by: Samasth Norway Ananda +Reviewed-by: Saeed Mirzamohammadi +Acked-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/vm/compaction_test.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/tools/testing/selftests/vm/compaction_test.c ++++ b/tools/testing/selftests/vm/compaction_test.c +@@ -183,8 +183,6 @@ int main(int argc, char **argv) + if (prereq() != 0) + return ksft_exit_pass(); + +- ksft_set_plan(1); +- + lim.rlim_cur = RLIM_INFINITY; + lim.rlim_max = RLIM_INFINITY; + if (setrlimit(RLIMIT_MEMLOCK, &lim)) diff --git a/queue-4.19/series b/queue-4.19/series index 524529f570c..9ccee0e6e49 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -10,3 +10,5 @@ net-mlx5-update-the-list-of-the-pci-supported-device.patch net-ftgmac100-enable-tx-interrupt-to-avoid-tx-timeou.patch net-dpaa-pad-packets-to-eth_zlen.patch soundwire-stream-revert-soundwire-stream-fix-programming-slave-ports-for-non-continous-port-maps.patch +selftests-vm-remove-call-to-ksft_set_plan.patch +selftests-kcmp-remove-call-to-ksft_set_plan.patch -- 2.47.3