The patch below does not apply to the 3.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From a53a11f35762ff1d5e268adedf2ab9ce313f871d Mon Sep 17 00:00:00 2001 From: James Hogan <[email protected]> Date: Mon, 29 Apr 2013 11:36:59 +0930 Subject: [PATCH] modpost: fix unwanted VMLINUX_SYMBOL_STR expansion Commit a4b6a77b77ba4f526392612c2365797fab956014 ("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 diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 1f90961..a4be8e1 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -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); } -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
