perf test: Fix vmlinux failure on s390x part 2 (5357413f) · Commits · 戴 / test

On s390x perf test 1 failed. It turned out that commit ("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 Signed-off-by:

Thomas-Mich Richter <tmricht@linux.vnet.ibm.com> Cc: Zvonko Kosic <zvonko.kosic@de.ibm.com> Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com> Fixes: ("perf report: Fix kernel symbol adjustment for s390x") LPU-Reference: 20170915071404.58398-2-tmricht@linux.vnet.ibm.com Link: http://lkml.kernel.org/n/tip-v101o8k25vuja2ogosgf15yy@git.kernel.org Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/perf/arch/s390/util/Build

+0 −1

Original line number	Diff line number	Diff line
		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

deleted100644 → 0

+0 −21

Original line number	Diff line number	Diff line
		/*
		* Architecture specific ELF symbol handling and relocation mapping.
		*
		* Copyright 2017 IBM Corp.
		* Author(s): Thomas Richter <tmricht@linux.vnet.ibm.com>
		*
		* 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

Admin message