Commit 066b34aa authored by Shuah Khan's avatar Shuah Khan
Browse files

tools: fix ARRAY_SIZE defines in tools and selftests hdrs 



tools/include/linux/kernel.h and kselftest_harness.h are missing
ifndef guard around ARRAY_SIZE define. Fix them to avoid duplicate
define errors during compile when another file defines it. This
problem was found when compiling selftests that include a header
with ARRAY_SIZE define.

ARRAY_SIZE is defined in several selftests. There are about 25+
duplicate defines in various selftests source and header files.
Add ARRAY_SIZE to kselftest.h in preparation for removing duplicate
ARRAY_SIZE defines from individual test files.

Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent a738a4ce

tools/include/linux/kernel.h

+2 −0
Original line number Diff line number Diff line
@@ -92,7 +92,9 @@ int vscnprintf(char *buf, size_t size, const char *fmt, va_list args); 
int scnprintf(char * buf, size_t size, const char * fmt, ...);

int scnprintf_pad(char * buf, size_t size, const char * fmt, ...);



#ifndef ARRAY_SIZE

#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))

#endif



#define current_gfp_context(k) 0

#define synchronize_rcu()

tools/testing/selftests/kselftest.h

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,10 @@ 
#include <stdarg.h>

#include <stdio.h>



#ifndef ARRAY_SIZE

#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))

#endif



/* define kselftest exit codes */

#define KSFT_PASS  0

#define KSFT_FAIL  1

tools/testing/selftests/kselftest_harness.h

+2 −0
Original line number Diff line number Diff line
@@ -671,7 +671,9 @@ 
#define EXPECT_STRNE(expected, seen) \

	__EXPECT_STR(expected, seen, !=, 0)



#ifndef ARRAY_SIZE

#define ARRAY_SIZE(a)	(sizeof(a) / sizeof(a[0]))

#endif



/* Support an optional handler after and ASSERT_* or EXPECT_*.  The approach is

 * not thread-safe, but it should be fine in most sane test scenarios.