tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

selftests: vDSO: fix vdso_config for s390

Running vdso_test_correctness on s390x (aka s390 64 bit) emits a warning:

Warning: failed to find clock_gettime64 in vDSO

This is caused by the "#elif defined (__s390__)" check in vdso_config.h
which the defines VDSO_32BIT.

If __s390x__ is defined also __s390__ is defined. Therefore the correct
check must make sure that only __s390__ is defined.

Therefore add the missing !defined(__s390x__). Also use common
__s390x__ define instead of __s390X__.

Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Fixes: 693f5ca08ca0 ("kselftest: Extend vDSO selftest")
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

authored by

Heiko Carstens and committed by
Jason A. Donenfeld a6e23fb8 14be4e6f

+2 -2
+2 -2
tools/testing/selftests/vDSO/vdso_config.h
··· 25 25 #define VDSO_VERSION 1 26 26 #define VDSO_NAMES 0 27 27 #define VDSO_32BIT 1 28 - #elif defined (__s390__) 28 + #elif defined (__s390__) && !defined(__s390x__) 29 29 #define VDSO_VERSION 2 30 30 #define VDSO_NAMES 0 31 31 #define VDSO_32BIT 1 32 - #elif defined (__s390X__) 32 + #elif defined (__s390x__) 33 33 #define VDSO_VERSION 2 34 34 #define VDSO_NAMES 0 35 35 #elif defined(__mips__)