diff options
author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2021-10-30 16:17:39 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-11-01 10:08:38 +0100 |
commit | 1ba220dcc3a8bd0369555e7c41ed246e889038fe (patch) | |
tree | 9d76553c7ed63c40a20de7e48a151dcf8faaa3a5 | |
parent | 531c74af49d70b7079488988fa0d11274b4bd599 (diff) | |
download | barebox-1ba220dcc3a8bd0369555e7c41ed246e889038fe.tar.gz barebox-1ba220dcc3a8bd0369555e7c41ed246e889038fe.tar.xz |
include: move ARRAY_AND_SIZE to <linux/kernel.h>
Linux defines this macro at multiple places. We define it once, but in
<common.h>, which is a bit heavy weight. Move it next to the
ARRAY_SIZE() definition.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20211030141739.2207431-5-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | include/common.h | 2 | ||||
-rw-r--r-- | include/linux/kernel.h | 1 | ||||
-rw-r--r-- | scripts/include/linux/kernel.h | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/include/common.h b/include/common.h index e37630243e..4167d4676e 100644 --- a/include/common.h +++ b/include/common.h @@ -88,8 +88,6 @@ enum autoboot_state do_autoboot_countdown(void); void __noreturn start_barebox(void); void shutdown_barebox(void); -#define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) - /* * The STACK_ALIGN_ARRAY macro is used to allocate a buffer on the stack that * meets a minimum alignment requirement. diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 9ccdd60224..4483d33e65 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -15,6 +15,7 @@ #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) +#define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) /* * This looks more complex than it should be. But we need to diff --git a/scripts/include/linux/kernel.h b/scripts/include/linux/kernel.h index dc2e64e164..f3083ff354 100644 --- a/scripts/include/linux/kernel.h +++ b/scripts/include/linux/kernel.h @@ -9,6 +9,7 @@ #define __ALIGN_MASK(x, mask) (((x) + (mask)) & ~(mask)) #define ALIGN(x, a) __ALIGN_MASK(x, (typeof(x))(a) - 1) #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) +#define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) |