aboutsummaryrefslogtreecommitdiff
path: root/scripts/mod/modpost.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-04-12 19:52:34 +0900
committerPaul Mundt <lethal@linux-sh.org>2012-04-12 19:52:34 +0900
commit33cd5cffd50a789f4e2f0f8bcd7ed9cf8a07da16 (patch)
treef142384aa88b5d25391084b1ef2d192d4e7556ce /scripts/mod/modpost.c
parenta4e02f6d83d4fcdb13bcaba76878fc5ea0da9911 (diff)
parent104fa61a7dd83197160d5cafedc0e94ad9cd7fcc (diff)
Merge branch 'common/clkfwk' into sh-latest
Diffstat (limited to 'scripts/mod/modpost.c')
-rw-r--r--scripts/mod/modpost.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 3f01fd90873..c4e7d1510f9 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -132,8 +132,10 @@ static struct module *new_module(char *modname)
/* strip trailing .o */
s = strrchr(p, '.');
if (s != NULL)
- if (strcmp(s, ".o") == 0)
+ if (strcmp(s, ".o") == 0) {
*s = '\0';
+ mod->is_dot_o = 1;
+ }
/* add to list */
mod->name = p;
@@ -587,7 +589,8 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
unsigned int crc;
enum export export;
- if (!is_vmlinux(mod->name) && strncmp(symname, "__ksymtab", 9) == 0)
+ if ((!is_vmlinux(mod->name) || mod->is_dot_o) &&
+ strncmp(symname, "__ksymtab", 9) == 0)
export = export_from_secname(info, get_secindex(info, sym));
else
export = export_from_sec(info, get_secindex(info, sym));