aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorUstyugov Roman <dr_unique@ymg.ru>2005-09-23 00:42:11 -0400
committerSam Ravnborg <sam@mars.ravnborg.org>2005-12-25 18:33:41 -0500
commitf83b5e323f57d6e1f35a839d663e91cebe985e54 (patch)
tree59e19500a8204abd8e77620b7e80138d5f7fda68 /scripts
parent4d99f93bdaa1ab49188cac67b4aae9180f8e3960 (diff)
kbuild: set correct KBUILD_MODNAME when using well known kernel symbols as module names
This patch fixes a problem when we use well known kernel symbols as module names. For example, if module source name is current.c, idle_stack.c or etc., we have a bad KBUILD_MODNAME value. For example, KBUILD_MODNAME will be "get_current()" instead of "current", or "(init_thread_union.stack)" instead of "idle_task". The trick is to define a stringify macro on the commandline - named KBUILD_STR for namespace reasons - and then to stringify the module name. There are a few uses of KBUILD_MODNAME throughout the tree but the usage is for debug and will not be harmed by this change so left untouched for now. While at it KBUILD_BASENAME was changed too. Any spinlock usage in the unix module would have created wrong section names without it. Usage in spinlock.h fixed so it no longer stringify KBUILD_BASENAME. Original patch from Ustyogov Roman - all bugs introduced by me. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.lib8
-rw-r--r--scripts/mod/modpost.c3
2 files changed, 6 insertions, 5 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 0f81dcfd6909..550798f57da5 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -81,8 +81,10 @@ obj-dirs := $(addprefix $(obj)/,$(obj-dirs))
81# Note: It's possible that one object gets potentially linked into more 81# Note: It's possible that one object gets potentially linked into more
82# than one module. In that case KBUILD_MODNAME will be set to foo_bar, 82# than one module. In that case KBUILD_MODNAME will be set to foo_bar,
83# where foo and bar are the name of the modules. 83# where foo and bar are the name of the modules.
84basename_flags = -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) 84name-fix = $(subst $(comma),_,$(subst -,_,$1))
85modname_flags = $(if $(filter 1,$(words $(modname))),-DKBUILD_MODNAME=$(subst $(comma),_,$(subst -,_,$(modname)))) 85basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(*F)))"
86modname_flags = $(if $(filter 1,$(words $(modname))),\
87 -D"KBUILD_MODNAME=KBUILD_STR($(call name-fix,$(modname)))")
86 88
87_c_flags = $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(*F).o) 89_c_flags = $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(*F).o)
88_a_flags = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o) 90_a_flags = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o)
@@ -113,7 +115,7 @@ endif
113 115
114c_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(CPPFLAGS) \ 116c_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(CPPFLAGS) \
115 $(__c_flags) $(modkern_cflags) \ 117 $(__c_flags) $(modkern_cflags) \
116 $(basename_flags) $(modname_flags) 118 -D"KBUILD_STR(s)=\#s" $(basename_flags) $(modname_flags)
117 119
118a_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(CPPFLAGS) \ 120a_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(CPPFLAGS) \
119 $(__a_flags) $(modkern_aflags) 121 $(__a_flags) $(modkern_aflags)
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 8ce5a6318684..f70ff13d4818 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -539,10 +539,9 @@ add_header(struct buffer *b, struct module *mod)
539 buf_printf(b, "\n"); 539 buf_printf(b, "\n");
540 buf_printf(b, "MODULE_INFO(vermagic, VERMAGIC_STRING);\n"); 540 buf_printf(b, "MODULE_INFO(vermagic, VERMAGIC_STRING);\n");
541 buf_printf(b, "\n"); 541 buf_printf(b, "\n");
542 buf_printf(b, "#undef unix\n"); /* We have a module called "unix" */
543 buf_printf(b, "struct module __this_module\n"); 542 buf_printf(b, "struct module __this_module\n");
544 buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n"); 543 buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
545 buf_printf(b, " .name = __stringify(KBUILD_MODNAME),\n"); 544 buf_printf(b, " .name = KBUILD_MODNAME,\n");
546 if (mod->has_init) 545 if (mod->has_init)
547 buf_printf(b, " .init = init_module,\n"); 546 buf_printf(b, " .init = init_module,\n");
548 if (mod->has_cleanup) 547 if (mod->has_cleanup)