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>
---
 tools/testing/selftests/vDSO/vdso_config.h | 4 ++--
 1 file 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__)
-- 
2.43.0

On Wed, Sep 11, 2024 at 10:50:15AM +0200, Heiko Carstens wrote:
> 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>

I'll add to it:

    Fixes: 693f5ca08ca0 ("kselftest: Extend vDSO selftest")