Frederik Schwan pushed to branch main at Arch Linux / Packaging / Packages /
linux-tools
Commits:
1022cb38 by Frederik Schwan at 2023-08-04T22:25:06+02:00
upgpkg: 6.3-3: binutils 2.41 rebuild
- - - - -
2 changed files:
- PKGBUILD
- + fix-perf-tests.patch
Changes:
=====================================
PKGBUILD
=====================================
@@ -15,7 +15,7 @@ pkgname=(
'x86_energy_perf_policy'
)
pkgver=6.3
-pkgrel=3
+pkgrel=4
license=('GPL2')
arch=('x86_64')
url='https://www.kernel.org'
@@ -48,7 +48,9 @@
source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#
'usbipd.service'
'hv_fcopy_daemon.service'
'hv_kvp_daemon.service'
- 'hv_vss_daemon.service')
+ 'hv_vss_daemon.service'
+ 'fix-perf-tests.patch'
+)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
@@ -60,7 +62,8 @@ sha256sums=('SKIP'
'2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f'
'16855c197d2334f820cb190312a5a7fffe9165189db01344a957e582e39e17d8'
'b1315cb77a35454e1af9172f821a52e2a0cb18561be05a340d21cf337b01ae61'
- '2d5e2f8d40b6f19bf2e1dead57ca105d72098fb0b418c09ff2e0cb91089710af')
+ '2d5e2f8d40b6f19bf2e1dead57ca105d72098fb0b418c09ff2e0cb91089710af'
+ '26bce106f363fd382b5669c5098c76c127d564da827b254847c7b7e76e39f912')
prepare() {
cd linux
=====================================
fix-perf-tests.patch
=====================================
@@ -0,0 +1,56 @@
+First noticed on Fedora Rawhide:
+
+ tests/bpf.c: In function ‘epoll_pwait_loop’:
+ tests/bpf.c:36:17: error: argument 2 null where non-null expected
[-Werror=nonnull]
+ 36 | epoll_pwait(-(i + 1), NULL, 0, 0, NULL);
+ | ^~~~~~~~~~~
+ In file included from tests/bpf.c:5:
+ /usr/include/sys/epoll.h:134:12: note: in a call to function ‘epoll_pwait’
declared ‘nonnull’
+ 134 | extern int epoll_pwait (int __epfd, struct epoll_event *__events,
+ | ^~~~~~~~~~~
+
+ [perfbuilder@27cfe44d67ed perf-6.5.0-rc2]$ gcc -v
+ Using built-in specs.
+ COLLECT_GCC=gcc
+ COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-redhat-linux/13/lto-wrapper
+ OFFLOAD_TARGET_NAMES=nvptx-none
+ OFFLOAD_TARGET_DEFAULT=1
+ Target: x86_64-redhat-linux
+ Configured with: ../configure --enable-bootstrap
--enable-languages=c,c++,fortran,objc,obj-c++,ada,go,d,m2,lto --prefix=/usr
--mandir=/usr/share/man --infodir=/usr/share/info
--with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-shared
--enable-threads=posix --enable-checking=release --enable-multilib
--with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions
--enable-gnu-unique-object --enable-linker-build-id
--with-gcc-major-version-only --enable-libstdcxx-backtrace
--with-libstdcxx-zoneinfo=/usr/share/zoneinfo --with-linker-hash-style=gnu
--enable-plugin --enable-initfini-array
--with-isl=/builddir/build/BUILD/gcc-13.2.1-20230728/obj-x86_64-redhat-linux/isl-install
--enable-offload-targets=nvptx-none --without-cuda-driver
--enable-offload-defaulted --enable-gnu-indirect-function --enable-cet
--with-tune=generic --with-arch_32=i686 --build=x86_64-redhat-linux
--with-build-config=bootstrap-lto --enable-link-serialization=1
+ Thread model: posix
+ Supported LTO compression algorithms: zlib zstd
+ gcc version 13.2.1 20230728 (Red Hat 13.2.1-1) (GCC)
+ [perfbuilder@27cfe44d67ed perf-6.5.0-rc2]$
+
+Just add that argument to address this compiler warning.
+
+Cc: Adrian Hunter <[email protected]>
+Cc: Ian Rogers <[email protected]>
+Cc: Jiri Olsa <[email protected]>
+Cc: Namhyung Kim <[email protected]>
+Link: https://lore.kernel.org/lkml/
+Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
+---
+ tools/perf/tests/bpf.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tools/perf/tests/bpf.c b/tools/perf/tests/bpf.c
+index 31796f2a80f47fb1..9ccecd873ecdd046 100644
+--- a/tools/perf/tests/bpf.c
++++ b/tools/perf/tests/bpf.c
+@@ -29,11 +29,12 @@
+
+ static int epoll_pwait_loop(void)
+ {
++ struct epoll_event events;
+ int i;
+
+ /* Should fail NR_ITERS times */
+ for (i = 0; i < NR_ITERS; i++)
+- epoll_pwait(-(i + 1), NULL, 0, 0, NULL);
++ epoll_pwait(-(i + 1), &events, 0, 0, NULL);
+ return 0;
+ }
+
+--
+2.37.1
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/linux-tools/-/commit/1022cb388912824688da1f0b3cbd84b33722e2cf
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/linux-tools/-/commit/1022cb388912824688da1f0b3cbd84b33722e2cf
You're receiving this email because of your account on gitlab.archlinux.org.
