[PATCH 4/8] module: retire MODULE_SYMBOL_PREFIX

Ahmad Fatoum a.fatoum at pengutronix.de
Tue Jul 16 04:58:30 PDT 2024


We only ever set MODULE_SYMBOL_PREFIX to the empty string and Linux has
dropped the macro as well in the meantime, so just remove the
definition.

Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
---
 common/module.c        | 4 ++--
 include/linux/export.h | 4 +---
 include/module.h       | 4 ----
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/common/module.c b/common/module.c
index b669ec09c99f..120fe4c88183 100644
--- a/common/module.c
+++ b/common/module.c
@@ -187,10 +187,10 @@ static void register_module_cmds(Elf32_Shdr *sechdrs, const char *strtab, unsign
 	sym = (void *)sechdrs[symindex].sh_addr;
 
 	for (i = 0; i < numsyms; i++) {
-		if (strcmp(strtab + sym[i].st_name, MODULE_SYMBOL_PREFIX "__barebox_cmd_start") == 0)
+		if (strcmp(strtab + sym[i].st_name, "__barebox_cmd_start") == 0)
 			cmd_start = (struct command * const *)sym[i].st_value;
 
-		if (strcmp(strtab + sym[i].st_name, MODULE_SYMBOL_PREFIX "__barebox_cmd_end") == 0)
+		if (strcmp(strtab + sym[i].st_name, "__barebox_cmd_end") == 0)
 			cmd_end = (struct command * const *)sym[i].st_value;
 	}
 
diff --git a/include/linux/export.h b/include/linux/export.h
index e8ec826366af..0856704018d2 100644
--- a/include/linux/export.h
+++ b/include/linux/export.h
@@ -4,8 +4,6 @@
 
 #ifndef __ASSEMBLY__
 
-#include <module.h>
-
 #define THIS_MODULE	0
 
 #if defined(CONFIG_MODULES) && !defined(__DISABLE_EXPORTS)
@@ -21,7 +19,7 @@ struct kernel_symbol
 	extern typeof(sym) sym;					\
 	static const char __ustrtab_##sym[]			\
 	__ll_elem(__usymtab_strings)				\
-	= MODULE_SYMBOL_PREFIX #sym;                    	\
+	= #sym;                    	\
 	static const struct kernel_symbol __usymtab_##sym	\
 	__ll_elem(__usymtab)					\
 	= { (unsigned long)&sym, __ustrtab_##sym }
diff --git a/include/module.h b/include/module.h
index 9099e5aeed56..0e81033b20d0 100644
--- a/include/module.h
+++ b/include/module.h
@@ -8,10 +8,6 @@
 #include <linux/export.h>
 #include <linux/list.h>
 
-#ifndef MODULE_SYMBOL_PREFIX
-#define MODULE_SYMBOL_PREFIX
-#endif
-
 #define MODULE_NAME_LEN (64 - sizeof(unsigned long))
 
 /* These are either module local, or the kernel's dummy ones. */
-- 
2.39.2




More information about the barebox mailing list