We'll remove the <linux/kernel.h> include from <linux/list.h> in a later commit, so prepare for that by defining the MODULE_* macros via driver.h as well, otherwise build of some drivers will break, because the relied on the transitive inclusion of <linux/barebox-wrapper.h> via <linux/list.h>. While at it we also remove a duplicate __init definition. Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> --- include/driver.h | 1 + include/linux/barebox-wrapper.h | 12 +----------- include/linux/module.h | 17 +++++++++++++++++ include/module.h | 1 + 4 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 include/linux/module.h diff --git a/include/driver.h b/include/driver.h index d4687fd2c2d2..2b4db2221a6c 100644 --- a/include/driver.h +++ b/include/driver.h @@ -10,6 +10,7 @@ #include <linux/ioport.h> #include <linux/uuid.h> #include <linux/printk.h> +#include <linux/module.h> #include <device.h> #include <of.h> #include <init.h> diff --git a/include/linux/barebox-wrapper.h b/include/linux/barebox-wrapper.h index 5d311e1d70f4..8320a24b7bc1 100644 --- a/include/linux/barebox-wrapper.h +++ b/include/linux/barebox-wrapper.h @@ -4,6 +4,7 @@ #include <malloc.h> #include <xfuncs.h> #include <linux/slab.h> +#include <linux/module.h> #include <printk.h> #define vmalloc(len) malloc(len) @@ -14,17 +15,6 @@ static inline void vfree(const void *addr) free((void *)addr); } -#define __init - -#define MODULE_AUTHOR(x) -#define MODULE_DESCRIPTION(x) -#define MODULE_LICENSE(x) -#define MODULE_VERSION(x) -#define MODULE_ALIAS(x) -#define MODULE_DEVICE_TABLE(bus, table) -#define MODULE_ALIAS_DSA_TAG_DRIVER(drv) -#define MODULE_ALIAS_CRYPTO(alias) - #define __user #define __init #define __exit diff --git a/include/linux/module.h b/include/linux/module.h new file mode 100644 index 000000000000..6a8ef6d6eccc --- /dev/null +++ b/include/linux/module.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef _LINUX_MODULE_H +#define _LINUX_MODULE_H + +#include <linux/export.h> + +#define MODULE_AUTHOR(x) +#define MODULE_DESCRIPTION(x) +#define MODULE_LICENSE(x) +#define MODULE_VERSION(x) +#define MODULE_ALIAS(x) +#define MODULE_DEVICE_TABLE(bus, table) +#define MODULE_ALIAS_DSA_TAG_DRIVER(drv) +#define MODULE_ALIAS_CRYPTO(alias) + +#endif diff --git a/include/module.h b/include/module.h index 0e81033b20d0..60ad6c3556d1 100644 --- a/include/module.h +++ b/include/module.h @@ -6,6 +6,7 @@ #include <elf.h> #include <linux/compiler.h> #include <linux/export.h> +#include <linux/module.h> #include <linux/list.h> #define MODULE_NAME_LEN (64 - sizeof(unsigned long)) -- 2.39.2
