Create section *(__builtin_drivers_list) to store the list of drivers names.
Every driver name "modname" from directory "moddir" will be stored in array:
const char moddir_modname[] __attribute__((section("__builtin_drivers_list")) =
"modname";
Using moddir prefix for variables names to prevent linking breakage
on the set of all architectures where dupricate names present.
The name template should be transmormed in something like __modname__name
in the future to catch duplicates, but now it's impossible.
Signed-off-by: Kirill Tkhai <ktk...@parallels.com>
---
include/asm-generic/vmlinux.lds.h | 3 +++
scripts/Makefile.build | 14 ++++++++++----
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/include/asm-generic/vmlinux.lds.h
b/include/asm-generic/vmlinux.lds.h
index 5ba0360..5bc6d56 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -237,6 +237,9 @@
*(__tracepoints_ptrs) /* Tracepoints: pointer array */\
VMLINUX_SYMBOL(__stop___tracepoints_ptrs) = .; \
*(__tracepoints_strings)/* Tracepoints: strings */ \
+ VMLINUX_SYMBOL(__start_builtin_drivers_list) = .; \
+ *(__builtin_drivers_list) \
+ VMLINUX_SYMBOL(__stop_builtin_drivers_list) = .; \
} \
\
.rodata1 : AT(ADDR(.rodata1) - LOAD_OFFSET) { \
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index bf3e677..e158a4d 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -136,6 +136,7 @@ $(obj-m) : quiet_modtag := [M]
# Default for not multi-part modules
modname = $(basetarget)
+modname_c_var = `echo $(kbuild-dir)/$(modname) | sed 's/\.\///g' | sed
's/-/_/g' | sed 's/\//__/g'`
$(multi-objs-m) : modname = $(modname-multi)
$(multi-objs-m:.o=.i) : modname = $(modname-multi)
@@ -376,11 +377,16 @@ $(filter $(addprefix $(obj)/, \
$($(subst $(obj)/,,$(@:.o=-objs))) \
$($(subst $(obj)/,,$(@:.o=-y)))), $^)
-quiet_cmd_link_multi-y = LD $@
-cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps)
$(cmd_secanalysis)
-
quiet_cmd_link_multi-m = LD [M] $@
-cmd_link_multi-m = $(cmd_link_multi-y)
+cmd_link_multi-m = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps)
$(cmd_secanalysis)
+
+quiet_cmd_link_multi-y = LD $@
+cmd_link_multi-y = \
+ echo "const char "$(modname_c_var)"[]
__attribute__((section(\"__builtin_drivers_list\"))) " \
+ "__attribute__ ((aligned(sizeof(unsigned long)))) =
\""$(modname)"\";" > $(kbuild-dir)/.$(modname).c; \
+ $(CC) $(c_flags) -c $(kbuild-dir)/.$(modname).c -o
$(kbuild-dir)/.$(modname).o; \
+ $(LD) $(ld_flags) -r -o $@ $(link_multi_deps)
$(kbuild-dir)/.$(modname).o $(cmd_secanalysis); \
+ rm -f $(kbuild-dir)/.$(modname).c
# We would rather have a list of rules like
# foo.o: $(foo-objs)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
