diff options
| author | Alejandro Colomar <alx.manpages@gmail.com> | 2021-11-19 19:16:47 +0100 |
|---|---|---|
| committer | Alejandro Colomar <alx.manpages@gmail.com> | 2021-11-20 14:45:32 +0100 |
| commit | 418a8fa44788190802291efbcf7c6365836ba7ee (patch) | |
| tree | 0400f319f8980d99eb7976151086b51dd0728244 | |
| parent | bb9b11f95249c20b8b044ccbe730402db5efaeb7 (diff) | |
tools/lib/traceevent/: Don't redefine ARRAY_SIZE()
Signed-off-by: Alejandro Colomar <alx.manpages@gmail.com>
| -rw-r--r-- | tools/lib/traceevent/plugins/plugin_futex.c | 4 | ||||
| -rw-r--r-- | tools/lib/traceevent/plugins/plugin_xen.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tools/lib/traceevent/plugins/plugin_futex.c b/tools/lib/traceevent/plugins/plugin_futex.c index eb7c9f8a850a..ad7f07640b17 100644 --- a/tools/lib/traceevent/plugins/plugin_futex.c +++ b/tools/lib/traceevent/plugins/plugin_futex.c @@ -5,14 +5,16 @@ * Author: Julia Cartwright <julia@ni.com> * */ + + #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <linux/array_size.h> #include <linux/futex.h> #include "event-parse.h" -#define ARRAY_SIZE(_a) (sizeof(_a) / sizeof((_a)[0])) struct futex_args { unsigned long long uaddr; diff --git a/tools/lib/traceevent/plugins/plugin_xen.c b/tools/lib/traceevent/plugins/plugin_xen.c index 993b208d0323..c4c46a4defc7 100644 --- a/tools/lib/traceevent/plugins/plugin_xen.c +++ b/tools/lib/traceevent/plugins/plugin_xen.c @@ -1,10 +1,14 @@ // SPDX-License-Identifier: GPL-2.0 + + +#include <linux/array_size.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include "event-parse.h" #include "trace-seq.h" + #define __HYPERVISOR_set_trap_table 0 #define __HYPERVISOR_mmu_update 1 #define __HYPERVISOR_set_gdt 2 @@ -100,8 +104,6 @@ static const char *xen_hypercall_names[] = { }; #undef N -#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) - static const char *xen_hypercall_name(unsigned op) { if (op < ARRAY_SIZE(xen_hypercall_names) && |