Commit a53a11f3 authored Apr 29, 2013 by James Hogan Committed by Rusty Russell Apr 29, 2013

modpost: fix unwanted VMLINUX_SYMBOL_STR expansion



Commit a4b6a77b ("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 <penguin-kernel@I-love.SAKURA.ne.jp>
Reported-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Tested-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Tested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: <stable@vger.kernel.org> # 3.9

parent 04b00bdb

scripts/mod/modpost.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}

Admin message