Commit e8990820 authored by Shuah Khan's avatar Shuah Khan

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: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 7527c038
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#define VALIDATION_DEFAULT_THRESHOLD 4 /* 4MB */ #define VALIDATION_DEFAULT_THRESHOLD 4 /* 4MB */
#define VALIDATION_NO_THRESHOLD 0 /* Verify the entire region */ #define VALIDATION_NO_THRESHOLD 0 /* Verify the entire region */
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
#define MIN(X, Y) ((X) < (Y) ? (X) : (Y)) #define MIN(X, Y) ((X) < (Y) ? (X) : (Y))
struct config { struct config {
......
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
#include <ucontext.h> #include <ucontext.h>
#include <sys/mman.h> #include <sys/mman.h>
#include "../kselftest.h"
/* Define some kernel-like types */ /* Define some kernel-like types */
#define u8 __u8 #define u8 __u8
#define u16 __u16 #define u16 __u16
...@@ -175,7 +177,6 @@ static inline void __pkey_write_allow(int pkey, int do_allow_write) ...@@ -175,7 +177,6 @@ static inline void __pkey_write_allow(int pkey, int do_allow_write)
dprintf4("pkey_reg now: %016llx\n", read_pkey_reg()); dprintf4("pkey_reg now: %016llx\n", read_pkey_reg());
} }
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
#define ALIGN_UP(x, align_to) (((x) + ((align_to)-1)) & ~((align_to)-1)) #define ALIGN_UP(x, align_to) (((x) + ((align_to)-1)) & ~((align_to)-1))
#define ALIGN_DOWN(x, align_to) ((x) & ~((align_to)-1)) #define ALIGN_DOWN(x, align_to) ((x) & ~((align_to)-1))
#define ALIGN_PTR_UP(p, ptr_align_to) \ #define ALIGN_PTR_UP(p, ptr_align_to) \
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <string.h> #include <string.h>
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) #include "../kselftest.h"
#ifdef __powerpc64__ #ifdef __powerpc64__
#define PAGE_SIZE (64 << 10) #define PAGE_SIZE (64 << 10)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment