Commit-ID:  0a0317b41e20770f81bc61d7b208957385466c3f
Gitweb:     http://git.kernel.org/tip/0a0317b41e20770f81bc61d7b208957385466c3f
Author:     Cody P Schafer <c...@linux.vnet.ibm.com>
AuthorDate: Fri, 10 Aug 2012 15:22:53 -0700
Committer:  Arnaldo Carvalho de Melo <a...@redhat.com>
CommitDate: Mon, 13 Aug 2012 14:22:32 -0300

perf symbols: Simplify out_fixup in kernel syms loading

The only site that jumps to out_fixup has (kallsyms_filename == NULL).
And all paths that reach 'if (err > 0)' without 'goto out_fixup' have
kallsyms_filename != NULL.

So skip over both the check & dso__set_long_name(), and remove the
check.

Signed-off-by: Cody P Schafer <c...@linux.vnet.ibm.com>
Cc: David Hansen <d...@linux.vnet.ibm.com>
Cc: Ingo Molnar <mi...@redhat.com>
Cc: Matt Hellsley <matth...@us.ibm.com>
Cc: Namhyung Kim <namhy...@kernel.org>
Cc: Paul Mackerras <pau...@samba.org>
Cc: Peter Zijlstra <a.p.zijls...@chello.nl>
Cc: Sukadev Bhattiprolu <suka...@linux.vnet.ibm.com>
Link: 
http://lkml.kernel.org/r/1344637382-22789-8-git-send-email-c...@linux.vnet.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
---
 tools/perf/util/symbol.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 2127002..e5c3817 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1503,9 +1503,8 @@ do_kallsyms:
        free(kallsyms_allocated_filename);
 
        if (err > 0) {
+               dso__set_long_name(dso, strdup("[kernel.kallsyms]"));
 out_fixup:
-               if (kallsyms_filename != NULL)
-                       dso__set_long_name(dso, strdup("[kernel.kallsyms]"));
                map__fixup_start(map);
                map__fixup_end(map);
        }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to