bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

selftests: vDSO: fix vdso_config for s390

Browse source 
[ Upstream commit a6e23fb8d3c0e3904da70beaf5d7e840a983c97f ]

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: 693f5ca08c ("kselftest: Extend vDSO selftest")
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Heiko Carstens 2024-09-11 10:50:15 +02:00 • committed by Greg Kroah-Hartman
parent 0fe35c4737
commit 2c74d33dbf
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tools/testing/selftests/vDSO/vdso_config.h
View file

@ -25,11 +25,11 @@
#define VDSO_VERSION 1 #define VDSO_VERSION 1
#define VDSO_NAMES 0 #define VDSO_NAMES 0
#define VDSO_32BIT 1 #define VDSO_32BIT 1
#elif defined (__s390__) #elif defined (__s390__) && !defined(__s390x__)
#define VDSO_VERSION 2 #define VDSO_VERSION 2
#define VDSO_NAMES 0 #define VDSO_NAMES 0
#define VDSO_32BIT 1 #define VDSO_32BIT 1
#elif defined (__s390X__) #elif defined (__s390x__)
#define VDSO_VERSION 2 #define VDSO_VERSION 2
#define VDSO_NAMES 0 #define VDSO_NAMES 0
#elif defined(__mips__) #elif defined(__mips__)