summaryrefslogtreecommitdiff
path: root/tools/testing
diff options
context:
space:
mode:
authorHeiko Carstens <hca@linux.ibm.com>2024-09-11 11:50:15 +0300
committerJason A. Donenfeld <Jason@zx2c4.com>2024-09-13 18:28:36 +0300
commita6e23fb8d3c0e3904da70beaf5d7e840a983c97f (patch)
treeb9752f232614653597eac0896155b61195566f69 /tools/testing
parent14be4e6f35221c4731b004553ecf7cbc6dc1d2d8 (diff)
downloadlinux-a6e23fb8d3c0e3904da70beaf5d7e840a983c97f.tar.xz
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>
Diffstat (limited to 'tools/testing')
-rw-r--r--tools/testing/selftests/vDSO/vdso_config.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/testing/selftests/vDSO/vdso_config.h b/tools/testing/selftests/vDSO/vdso_config.h
index 740ce8c98d2e..722260f97561 100644
--- a/tools/testing/selftests/vDSO/vdso_config.h
+++ b/tools/testing/selftests/vDSO/vdso_config.h
@@ -25,11 +25,11 @@
#define VDSO_VERSION 1
#define VDSO_NAMES 0
#define VDSO_32BIT 1
-#elif defined (__s390__)
+#elif defined (__s390__) && !defined(__s390x__)
#define VDSO_VERSION 2
#define VDSO_NAMES 0
#define VDSO_32BIT 1
-#elif defined (__s390X__)
+#elif defined (__s390x__)
#define VDSO_VERSION 2
#define VDSO_NAMES 0
#elif defined(__mips__)