Commit f995b5f7 authored Mar 09, 2016 by Petr Mladek Committed by Jiri Kosina Mar 09, 2016

livepatch: Fix the error message about unresolvable ambiguity



klp_find_callback() stops the search when sympos is not defined and
a second symbol of the same name is found. It means that the current
error message about the unresolvable ambiguity always prints "(2 matches)".

Let's remove this information. The total number of occurrences is
not much helpful. The author of the patch still must put a non-trivial
effort into searching the right position in the object file.

[jkosina@suse.cz: fixed grammar as suggested by Josh]
Signed-off-by: Petr Mladek <pmladek@suse.com>
Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
Acked-by: Chris J Arges <chris.j.arges@canonical.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

parent 335e073f

kernel/livepatch/core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -190,8 +190,8 @@ static int klp_find_object_symbol(const char objname, const char name,
		if (args.addr == 0)
		pr_err("symbol '%s' not found in symbol table\n", name);
		else if (args.count > 1 && sympos == 0) {
		pr_err("unresolvable ambiguity (%lu matches) on symbol '%s' in object '%s'\n",
		args.count, name, objname);
		pr_err("unresolvable ambiguity for symbol '%s' in object '%s'\n",
		name, objname);
		} else if (sympos != args.count && sympos > 0) {
		pr_err("symbol position %lu for symbol '%s' in object '%s' not found\n",
		sympos, name, objname ? objname : "vmlinux");

Admin message