From: Greg Kroah-Hartman Date: Mon, 15 Apr 2024 12:52:20 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v5.15.156~34 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fkernel%2Fstable-queue.git;a=commitdiff_plain;h=5f4e929f30ca09f91528ad3c764fa8f7314c5e91 6.1-stable patches added patches: selftests-timers-fix-abs-warning-in-posix_timers-test.patch --- diff --git a/queue-6.1/selftests-timers-fix-abs-warning-in-posix_timers-test.patch b/queue-6.1/selftests-timers-fix-abs-warning-in-posix_timers-test.patch new file mode 100644 index 0000000000..2a26a8d799 --- /dev/null +++ b/queue-6.1/selftests-timers-fix-abs-warning-in-posix_timers-test.patch @@ -0,0 +1,39 @@ +From ed366de8ec89d4f960d66c85fc37d9de22f7bf6d Mon Sep 17 00:00:00 2001 +From: John Stultz +Date: Wed, 10 Apr 2024 16:26:30 -0700 +Subject: selftests: timers: Fix abs() warning in posix_timers test + +From: John Stultz + +commit ed366de8ec89d4f960d66c85fc37d9de22f7bf6d upstream. + +Building with clang results in the following warning: + + posix_timers.c:69:6: warning: absolute value function 'abs' given an + argument of type 'long long' but has parameter of type 'int' which may + cause truncation of value [-Wabsolute-value] + if (abs(diff - DELAY * USECS_PER_SEC) > USECS_PER_SEC / 2) { + ^ +So switch to using llabs() instead. + +Fixes: 0bc4b0cf1570 ("selftests: add basic posix timers selftests") +Signed-off-by: John Stultz +Signed-off-by: Thomas Gleixner +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/20240410232637.4135564-3-jstultz@google.com +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/timers/posix_timers.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/timers/posix_timers.c ++++ b/tools/testing/selftests/timers/posix_timers.c +@@ -66,7 +66,7 @@ static int check_diff(struct timeval sta + diff = end.tv_usec - start.tv_usec; + diff += (end.tv_sec - start.tv_sec) * USECS_PER_SEC; + +- if (abs(diff - DELAY * USECS_PER_SEC) > USECS_PER_SEC / 2) { ++ if (llabs(diff - DELAY * USECS_PER_SEC) > USECS_PER_SEC / 2) { + printf("Diff too high: %lld..", diff); + return -1; + } diff --git a/queue-6.1/series b/queue-6.1/series index 05cc228215..8144fe6feb 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -52,3 +52,4 @@ vhost-add-smp_rmb-in-vhost_vq_avail_empty.patch vhost-add-smp_rmb-in-vhost_enable_notify.patch perf-x86-fix-out-of-range-data.patch x86-cpu-actually-turn-off-mitigations-by-default-for-speculation_mitigations-n.patch +selftests-timers-fix-abs-warning-in-posix_timers-test.patch