From: Shuah Khan <skhan@linuxfoundation.org>
To: catalin.marinas@arm.com, will@kernel.org, shuah@kernel.org,
keescook@chromium.org, mic@digikod.net, davem@davemloft.net,
kuba@kernel.org, peterz@infradead.org, paulmck@kernel.org,
boqun.feng@gmail.com, akpm@linux-foundation.org
Cc: Shuah Khan <skhan@linuxfoundation.org>,
linux-kselftest@vger.kernel.org,
linux-security-module@vger.kernel.org, netdev@vger.kernel.org,
linux-mm@kvack.org
Subject: [PATCH 12/12] selftests/vm: remove ARRAY_SIZE define from individual tests
Date: Fri, 10 Dec 2021 10:33:22 -0700 [thread overview]
Message-ID: <18321f68b399cd2c2709131d6d6eb1d0f58e8b4f.1639156389.git.skhan@linuxfoundation.org> (raw)
In-Reply-To: <cover.1639156389.git.skhan@linuxfoundation.org>
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 <skhan@linuxfoundation.org>
---
tools/testing/selftests/vm/mremap_test.c | 1 -
tools/testing/selftests/vm/pkey-helpers.h | 3 ++-
tools/testing/selftests/vm/va_128TBswitch.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/vm/mremap_test.c b/tools/testing/selftests/vm/mremap_test.c
index 0624d1bd71b5..7c0b0617b9f8 100644
--- a/tools/testing/selftests/vm/mremap_test.c
+++ b/tools/testing/selftests/vm/mremap_test.c
@@ -20,7 +20,6 @@
#define VALIDATION_DEFAULT_THRESHOLD 4 /* 4MB */
#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))
struct config {
diff --git a/tools/testing/selftests/vm/pkey-helpers.h b/tools/testing/selftests/vm/pkey-helpers.h
index 622a85848f61..92f3be3dd8e5 100644
--- a/tools/testing/selftests/vm/pkey-helpers.h
+++ b/tools/testing/selftests/vm/pkey-helpers.h
@@ -13,6 +13,8 @@
#include <ucontext.h>
#include <sys/mman.h>
+#include "../kselftest.h"
+
/* Define some kernel-like types */
#define u8 __u8
#define u16 __u16
@@ -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());
}
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
#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_PTR_UP(p, ptr_align_to) \
diff --git a/tools/testing/selftests/vm/va_128TBswitch.c b/tools/testing/selftests/vm/va_128TBswitch.c
index 83acdff26a13..da6ec3b53ea8 100644
--- a/tools/testing/selftests/vm/va_128TBswitch.c
+++ b/tools/testing/selftests/vm/va_128TBswitch.c
@@ -9,7 +9,7 @@
#include <sys/mman.h>
#include <string.h>
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+#include "../kselftest.h"
#ifdef __powerpc64__
#define PAGE_SIZE (64 << 10)
--
2.32.0
prev parent reply other threads:[~2021-12-10 17:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-10 17:33 [PATCH 00/12] selftests: Remove ARRAY_SIZE duplicate defines Shuah Khan
2021-12-10 17:33 ` [PATCH 01/12] tools: fix ARRAY_SIZE defines in tools and selftests hdrs Shuah Khan
2021-12-13 20:38 ` Kees Cook
2021-12-10 17:33 ` [PATCH 02/12] selftests/arm64: remove ARRAY_SIZE define from vec-syscfg.c Shuah Khan
2021-12-13 15:45 ` Will Deacon
2021-12-10 17:33 ` [PATCH 03/12] selftests/cgroup: remove ARRAY_SIZE define from cgroup_util.h Shuah Khan
2021-12-10 17:33 ` [PATCH 04/12] selftests/core: remove ARRAY_SIZE define from close_range_test.c Shuah Khan
2021-12-10 17:33 ` [PATCH 05/12] selftests/ir: remove ARRAY_SIZE define from ir_loopback.c Shuah Khan
2021-12-10 17:33 ` [PATCH 06/12] selftests/landlock: remove ARRAY_SIZE define from common.h Shuah Khan
2021-12-13 15:36 ` Mickaël Salaün
2021-12-10 17:33 ` [PATCH 07/12] selftests/net: remove ARRAY_SIZE define from individual tests Shuah Khan
2021-12-11 3:03 ` Jakub Kicinski
2021-12-10 17:33 ` [PATCH 08/12] selftests/rseq: " Shuah Khan
2021-12-10 17:33 ` [PATCH 09/12] selftests/seccomp: remove ARRAY_SIZE define from seccomp_benchmark Shuah Khan
2021-12-13 20:38 ` Kees Cook
2021-12-10 17:33 ` [PATCH 10/12] selftests/sparc64: remove ARRAY_SIZE define from adi-test Shuah Khan
2021-12-10 17:33 ` [PATCH 11/12] selftests/timens: remove ARRAY_SIZE define from individual tests Shuah Khan
2021-12-10 17:33 ` Shuah Khan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=18321f68b399cd2c2709131d6d6eb1d0f58e8b4f.1639156389.git.skhan@linuxfoundation.org \
--to=skhan@linuxfoundation.org \
--cc=akpm@linux-foundation.org \
--cc=boqun.feng@gmail.com \
--cc=catalin.marinas@arm.com \
--cc=davem@davemloft.net \
--cc=keescook@chromium.org \
--cc=kuba@kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-security-module@vger.kernel.org \
--cc=mic@digikod.net \
--cc=netdev@vger.kernel.org \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=shuah@kernel.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).