# git rev-parse -q --verify a7aaa2f26bfd932a654706b19859e7adf802bee2^{commit} a7aaa2f26bfd932a654706b19859e7adf802bee2 already have revision, skipping fetch # git checkout -q -f -B kisskb a7aaa2f26bfd932a654706b19859e7adf802bee2 # git clean -qxdf # < git log -1 # commit a7aaa2f26bfd932a654706b19859e7adf802bee2 # Author: Sandipan Das # Date: Tue Aug 4 23:01:37 2020 +0530 # # selftests/powerpc: Fix pkey syscall redefinitions # # On distros using older glibc versions, the pkey tests encounter build # failures due to redefinition of the pkey syscall numbers. # # For compatibility, commit 743f3544fffb added a wrapper for the # gettid() syscall and included syscall.h if the version of glibc used # is older than 2.30. This leads to different definitions of SYS_pkey_* # as the ones in the pkey test header set numeric constants where as the # ones from syscall.h reuse __NR_pkey_*. The compiler complains about # redefinitions since they are different. # # This replaces SYS_pkey_* definitions with __NR_pkey_* such that the # definitions in both syscall.h and pkeys.h are alike. This way, if # syscall.h has to be included for compatibility reasons, builds will # still succeed. # # Fixes: 743f3544fffb ("selftests/powerpc: Add wrapper for gettid") # Reported-by: Sachin Sant # Suggested-by: David Laight # Suggested-by: Michael Ellerman # Signed-off-by: Sandipan Das # Signed-off-by: Michael Ellerman # Link: https://lore.kernel.org/r/a4956d838bf59b0a71a2553c5ca81131ea8b49b9.1596561758.git.sandipan@linux.ibm.com # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 a7aaa2f26bfd932a654706b19859e7adf802bee2 # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-next_skiroot_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- skiroot_defconfig # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-next_skiroot_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-next_skiroot_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-next_skiroot_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- Completed OK # rm -rf /kisskb/build/powerpc-next_skiroot_defconfig_powerpc-gcc5 # Build took: 0:01:41.278283