Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932804AbcCIOV1 (ORCPT ); Wed, 9 Mar 2016 09:21:27 -0500 Received: from mx2.suse.de ([195.135.220.15]:53480 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750803AbcCIOVS (ORCPT ); Wed, 9 Mar 2016 09:21:18 -0500 From: Petr Mladek To: Josh Poimboeuf , Jiri Kosina Cc: Jessica Yu , Miroslav Benes , live-patching@vger.kernel.org, linux-kernel@vger.kernel.org, Chris J Arges , Petr Mladek Subject: [PATCH] livepatch: Fix the error message about unresolvable ambiguity Date: Wed, 9 Mar 2016 15:20:59 +0100 Message-Id: <1457533259-6138-1-git-send-email-pmladek@suse.com> X-Mailer: git-send-email 1.8.5.6 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1338 Lines: 30 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. Signed-off-by: Petr Mladek --- kernel/livepatch/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c index bc2c85c064c1..f2eda09e8357 100644 --- a/kernel/livepatch/core.c +++ b/kernel/livepatch/core.c @@ -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 on 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"); -- 1.8.5.6