]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Revert "selftests: kselftest: Fix build failure with NOLIBC"
authorThomas Weißschuh <linux@weissschuh.net>
Sun, 9 Feb 2025 20:27:13 +0000 (21:27 +0100)
committerThomas Weißschuh <linux@weissschuh.net>
Wed, 26 Feb 2025 21:13:48 +0000 (22:13 +0100)
This reverts commit 16767502aa990cca2cb7d1372b31d328c4c85b40.

Nolibc gained support for uname(2) and sscanf(3) which are the
dependencies of ksft_min_kernel_version().

So re-enable support for ksft_min_kernel_version() under nolibc.

Acked-by: Shuah Khan <skhan@linuxfoundation.org>
Acked-by: Willy Tarreau <w@1wt.eu>
Link: https://lore.kernel.org/r/20250209-nolibc-scanf-v2-2-c29dea32f1cd@weissschuh.net
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
tools/testing/selftests/kselftest.h

index cdf91b0ca40fbdc4fb825b86d4dc547b5afa673c..c3b6d2604b1e486af5a224a11386f75fe0a83495 100644 (file)
@@ -444,10 +444,6 @@ static inline __noreturn __printf(1, 2) void ksft_exit_skip(const char *msg, ...
 static inline int ksft_min_kernel_version(unsigned int min_major,
                                          unsigned int min_minor)
 {
-#ifdef NOLIBC
-       ksft_print_msg("NOLIBC: Can't check kernel version: Function not implemented\n");
-       return 0;
-#else
        unsigned int major, minor;
        struct utsname info;
 
@@ -455,7 +451,6 @@ static inline int ksft_min_kernel_version(unsigned int min_major,
                ksft_exit_fail_msg("Can't parse kernel version\n");
 
        return major > min_major || (major == min_major && minor >= min_minor);
-#endif
 }
 
 #endif /* __KSELFTEST_H */