diff options
| author | Alejandro Colomar <alx.manpages@gmail.com> | 2021-11-19 19:14:11 +0100 |
|---|---|---|
| committer | Alejandro Colomar <alx.manpages@gmail.com> | 2021-11-20 14:45:33 +0100 |
| commit | ecaee90a1b3ca377a993aee78b43d106dd20f9a0 (patch) | |
| tree | 8d51ad59ae14eb90c5f7d3b7b68ef222f77c5d04 | |
| parent | 2392de0d71f21c2872711b97604dad887a28a735 (diff) | |
tools/testing/selftests/rseq/: Don't redefine ARRAY_SIZE()
Signed-off-by: Alejandro Colomar <alx.manpages@gmail.com>
| -rw-r--r-- | tools/testing/selftests/rseq/basic_percpu_ops_test.c | 4 | ||||
| -rw-r--r-- | tools/testing/selftests/rseq/rseq.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tools/testing/selftests/rseq/basic_percpu_ops_test.c b/tools/testing/selftests/rseq/basic_percpu_ops_test.c index eb3f6db36d36..e7bad3ddc5a9 100644 --- a/tools/testing/selftests/rseq/basic_percpu_ops_test.c +++ b/tools/testing/selftests/rseq/basic_percpu_ops_test.c @@ -1,6 +1,9 @@ // SPDX-License-Identifier: LGPL-2.1 + + #define _GNU_SOURCE #include <assert.h> +#include <linux/array_size.h> #include <pthread.h> #include <sched.h> #include <stdint.h> @@ -11,7 +14,6 @@ #include "rseq.h" -#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) struct percpu_lock_entry { intptr_t v; diff --git a/tools/testing/selftests/rseq/rseq.c b/tools/testing/selftests/rseq/rseq.c index 7159eb777fd3..d2fb538a8570 100644 --- a/tools/testing/selftests/rseq/rseq.c +++ b/tools/testing/selftests/rseq/rseq.c @@ -15,8 +15,10 @@ * Lesser General Public License for more details. */ + #define _GNU_SOURCE #include <errno.h> +#include <linux/array_size.h> #include <sched.h> #include <stdio.h> #include <stdlib.h> @@ -29,7 +31,6 @@ #include "rseq.h" -#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) __thread volatile struct rseq __rseq_abi = { .cpu_id = RSEQ_CPU_ID_UNINITIALIZED, |