Skip to content

Commit e899082

Browse files
committed
selftests/vm: remove ARRAY_SIZE define from individual tests
ARRAY_SIZE is defined in several selftests. Remove definitions from individual test files and include header file for the define instead. ARRAY_SIZE define is added in a separate patch to prepare for this change. Remove ARRAY_SIZE from vm tests and pickup the one defined in kselftest.h. Signed-off-by: Shuah Khan <[email protected]>
1 parent 7527c03 commit e899082

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

tools/testing/selftests/vm/mremap_test.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#define VALIDATION_DEFAULT_THRESHOLD 4 /* 4MB */
2121
#define VALIDATION_NO_THRESHOLD 0 /* Verify the entire region */
2222

23-
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
2423
#define MIN(X, Y) ((X) < (Y) ? (X) : (Y))
2524

2625
struct config {

tools/testing/selftests/vm/pkey-helpers.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
#include <ucontext.h>
1414
#include <sys/mman.h>
1515

16+
#include "../kselftest.h"
17+
1618
/* Define some kernel-like types */
1719
#define u8 __u8
1820
#define u16 __u16
@@ -175,7 +177,6 @@ static inline void __pkey_write_allow(int pkey, int do_allow_write)
175177
dprintf4("pkey_reg now: %016llx\n", read_pkey_reg());
176178
}
177179

178-
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
179180
#define ALIGN_UP(x, align_to) (((x) + ((align_to)-1)) & ~((align_to)-1))
180181
#define ALIGN_DOWN(x, align_to) ((x) & ~((align_to)-1))
181182
#define ALIGN_PTR_UP(p, ptr_align_to) \

tools/testing/selftests/vm/va_128TBswitch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <sys/mman.h>
1010
#include <string.h>
1111

12-
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
12+
#include "../kselftest.h"
1313

1414
#ifdef __powerpc64__
1515
#define PAGE_SIZE (64 << 10)

0 commit comments

Comments
 (0)