Skip to contentSkip to conversation

perf test: Fix vmlinux failure on s390x part 2

tip:perf/urgent tip-bot for Thomas Richter 1 participant 1 message Sep 29, 2017 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  5357413f5c067f60933e4b8d79d483fbe62b2bb5
Gitweb:     https://git.kernel.org/tip/5357413f5c067f60933e4b8d79d483fbe62b2bb5
Author:     Thomas Richter <[email protected]>
AuthorDate: Fri, 15 Sep 2017 09:14:04 +0200
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 28 Sep 2017 13:01:42 -0300

perf test: Fix vmlinux failure on s390x part 2

On s390x perf test 1 failed. It turned out that commit cf6383f73cf2 ("perf report: Fix kernel symbol adjustment for s390x") was incorrect.

The previous implementation in dso__load_sym() is also suitable for s390x.

Therefore this patch undoes commit cf6383f73cf2

Cc Zvonko Kosic <[email protected]>
Cc Hendrik Brueckner <[email protected]>
Fixes cf6383f73cf2 ("perf report: Fix kernel symbol adjustment for s390x")

LPU-Reference: [email protected]

---
 tools/perf/arch/s390/util/Build          |  1 -
 tools/perf/arch/s390/util/sym-handling.c | 21 ---------------------
 2 files changed, 22 deletions(-)
tools/perf/arch/s390/util/Build +0 -1
index bd518b6..5bd7b92 100644
@@ -1,5 +1,4 @@
 libperf-y += header.o
-libperf-y += sym-handling.o
 libperf-y += kvm-stat.o
 
 libperf-$(CONFIG_DWARF) += dwarf-regs.o
tools/perf/arch/s390/util/sym-handling.c deleted +0 -21
deleted file mode 100644
index 581d4c5..0000000
@@ -1,21 +0,0 @@
-/*
- * Architecture specific ELF symbol handling and relocation mapping.
- *
- * Copyright 2017 IBM Corp.
- * Author(s): Thomas Richter <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License (version 2 only)
- * as published by the Free Software Foundation.
- */
-
-#include "symbol.h"
-
-#ifdef HAVE_LIBELF_SUPPORT
-bool elf__needs_adjust_symbols(GElf_Ehdr ehdr)
-{
-	if (ehdr.e_type == ET_EXEC)
-		return false;
-	return ehdr.e_type == ET_REL || ehdr.e_type == ET_DYN;
-}
-#endif