Skip to content

Commit

Permalink
modpost: fix unwanted VMLINUX_SYMBOL_STR expansion
Browse files Browse the repository at this point in the history
Commit a4b6a77 ("module: fix symbol
versioning with symbol prefixes") broke the MODVERSIONS loading of any
module using memcmp (e.g. ipv6) on x86_32, as it's defined to
__builtin_memcmp which is expanded by VMLINUX_SYMBOL_STR. Use
__VMLINUX_SYMBOL_STR instead which doesn't expand the argument.

Reported-by: Tetsuo Handa <[email protected]>
Reported-by: Andy Shevchenko <[email protected]>
Signed-off-by: James Hogan <[email protected]>
Cc: H. Peter Anvin <[email protected]>
Tested-by: Tetsuo Handa <[email protected]>
Tested-by: Andy Shevchenko <[email protected]>
Signed-off-by: Rusty Russell <[email protected]>
Cc: <[email protected]> # 3.9
  • Loading branch information
James Hogan authored and rustyrussell committed Apr 29, 2013
1 parent 04b00bd commit a53a11f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scripts/mod/modpost.c
Original file line number Diff line number Diff line change
Expand Up @@ -1957,7 +1957,7 @@ static int add_versions(struct buffer *b, struct module *mod)
s->name, mod->name);
continue;
}
buf_printf(b, "\t{ %#8x, VMLINUX_SYMBOL_STR(%s) },\n",
buf_printf(b, "\t{ %#8x, __VMLINUX_SYMBOL_STR(%s) },\n",
s->crc, s->name);
}

Expand Down

0 comments on commit a53a11f

Please sign in to comment.