drop powerpc-selftests-use-timersub-for-gettimeofday.patch from 6.0

diff --git a/queue-6.0/powerpc-selftests-use-timersub-for-gettimeofday.patch b/queue-6.0/powerpc-selftests-use-timersub-for-gettimeofday.patch
deleted file mode 100644 (file)
index f9ee7dc..0000000
--- a/queue-6.0/powerpc-selftests-use-timersub-for-gettimeofday.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 8dec9501e43162a55dc5d4e1d3b68aadaf5ab847 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 16 Aug 2022 10:51:06 +0000
-Subject: powerpc/selftests: Use timersub() for gettimeofday()
-
-From: ye xingchen <ye.xingchen@zte.com.cn>
-
-[ Upstream commit c814bf958926ff45a9c1e899bd001006ab6cfbae ]
-
-Use timersub() function to simplify the code.
-
-Reported-by: Zeal Robot <zealci@zte.com.cn>
-Signed-off-by: ye xingchen <ye.xingchen@zte.com.cn>
-Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-Link: https://lore.kernel.org/r/20220816105106.82666-1-ye.xingchen@zte.com.cn
-Stable-dep-of: d21f4b7ffc22 ("pinctrl: qcom: Avoid glitching lines when we first mux to output")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/testing/selftests/powerpc/benchmarks/gettimeofday.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/tools/testing/selftests/powerpc/benchmarks/gettimeofday.c b/tools/testing/selftests/powerpc/benchmarks/gettimeofday.c
-index 6b415683357b..580fcac0a09f 100644
---- a/tools/testing/selftests/powerpc/benchmarks/gettimeofday.c
-+++ b/tools/testing/selftests/powerpc/benchmarks/gettimeofday.c
-@@ -12,7 +12,7 @@ static int test_gettimeofday(void)
- {
-       int i;
- 
--      struct timeval tv_start, tv_end;
-+      struct timeval tv_start, tv_end, tv_diff;
- 
-       gettimeofday(&tv_start, NULL);
- 
-@@ -20,7 +20,9 @@ static int test_gettimeofday(void)
-               gettimeofday(&tv_end, NULL);
-       }
- 
--      printf("time = %.6f\n", tv_end.tv_sec - tv_start.tv_sec + (tv_end.tv_usec - tv_start.tv_usec) * 1e-6);
-+      timersub(&tv_start, &tv_end, &tv_diff);
-+
-+      printf("time = %.6f\n", tv_diff.tv_sec + (tv_diff.tv_usec) * 1e-6);
- 
-       return 0;
- }
--- 
-2.35.1
-

diff --git a/queue-6.0/series b/queue-6.0/series
index b7aa9a3e9298f2cf320871d69da4cc022cbab2aa..a20908ffe30819a92379f5b04fbf059d762388ee 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -132,7 +132,6 @@ asoc-qcom-lpass-cpu-mark-hdmi-tx-registers-as-volati.patch
 drm-msm-a6xx-fix-kvzalloc-vs-state_kcalloc-usage.patch
 erofs-fix-illegal-unmapped-accesses-in-z_erofs_fill_.patch
 erofs-fix-up-inplace-decompression-success-rate.patch
-powerpc-selftests-use-timersub-for-gettimeofday.patch
 pinctrl-qcom-avoid-glitching-lines-when-we-first-mux.patch
 spi-qup-support-using-gpio-as-chip-select-line.patch
 x86-fpu-configure-init_fpstate-attributes-orderly.patch