Commit 2e364635 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo-4.15-20171218' of... 

Merge tag 'perf-urgent-for-mingo-4.15-20171218' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

- Fix up build in hardened environments, such as fedora 27 (Jiri Olsa)

- Do not include header files from the kernel sources for the s/390 arch,
  fixing the detached tarball building (Arnaldo Carvalho de Melo)

- Allow again using asm.h when building for the 'bpf' clang target,
  guarding x86 specific bits under ifndef __BPF__ (Arnaldo Carvalho de Melo)

- Generate correct debug information for inlined code when generating
  ELF images for JITted java programs (Ben Gainey)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 1291a0d5 ca26cffa

arch/x86/include/asm/asm.h

+2 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ 
#endif



#ifndef __ASSEMBLY__

#ifndef __BPF__

/*

 * This output constraint should be used for any inline asm which has a "call"

 * instruction.  Otherwise the asm may be inserted before the frame pointer
@@ -145,5 +146,6 @@ 
register unsigned long current_stack_pointer asm(_ASM_SP);

#define ASM_CALL_CONSTRAINT "+r" (current_stack_pointer)

#endif

#endif



#endif /* _ASM_X86_ASM_H */

tools/arch/s390/include/uapi/asm/perf_regs.h

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef _ASM_S390_PERF_REGS_H

#define _ASM_S390_PERF_REGS_H



enum perf_event_s390_regs {

	PERF_REG_S390_R0,

	PERF_REG_S390_R1,

	PERF_REG_S390_R2,

	PERF_REG_S390_R3,

	PERF_REG_S390_R4,

	PERF_REG_S390_R5,

	PERF_REG_S390_R6,

	PERF_REG_S390_R7,

	PERF_REG_S390_R8,

	PERF_REG_S390_R9,

	PERF_REG_S390_R10,

	PERF_REG_S390_R11,

	PERF_REG_S390_R12,

	PERF_REG_S390_R13,

	PERF_REG_S390_R14,

	PERF_REG_S390_R15,

	PERF_REG_S390_FP0,

	PERF_REG_S390_FP1,

	PERF_REG_S390_FP2,

	PERF_REG_S390_FP3,

	PERF_REG_S390_FP4,

	PERF_REG_S390_FP5,

	PERF_REG_S390_FP6,

	PERF_REG_S390_FP7,

	PERF_REG_S390_FP8,

	PERF_REG_S390_FP9,

	PERF_REG_S390_FP10,

	PERF_REG_S390_FP11,

	PERF_REG_S390_FP12,

	PERF_REG_S390_FP13,

	PERF_REG_S390_FP14,

	PERF_REG_S390_FP15,

	PERF_REG_S390_MASK,

	PERF_REG_S390_PC,



	PERF_REG_S390_MAX

};



#endif /* _ASM_S390_PERF_REGS_H */

tools/perf/Makefile.config

+4 −5
Original line number Diff line number Diff line
@@ -188,9 +188,7 @@ ifdef PYTHON_CONFIG 
  PYTHON_EMBED_LDFLAGS := $(call strip-libs,$(PYTHON_EMBED_LDOPTS))

  PYTHON_EMBED_LIBADD := $(call grep-libs,$(PYTHON_EMBED_LDOPTS)) -lutil

  PYTHON_EMBED_CCOPTS := $(shell $(PYTHON_CONFIG_SQ) --cflags 2>/dev/null)

  ifeq ($(CC_NO_CLANG), 1)

  PYTHON_EMBED_CCOPTS := $(filter-out -specs=%,$(PYTHON_EMBED_CCOPTS))

  endif

  FLAGS_PYTHON_EMBED := $(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS)

endif
@@ -576,14 +574,15 @@ ifndef NO_GTK2 
  endif

endif





ifdef NO_LIBPERL

  CFLAGS += -DNO_LIBPERL

else

  PERL_EMBED_LDOPTS = $(shell perl -MExtUtils::Embed -e ldopts 2>/dev/null)

  PERL_EMBED_LDFLAGS = $(call strip-libs,$(PERL_EMBED_LDOPTS))

  PERL_EMBED_LIBADD = $(call grep-libs,$(PERL_EMBED_LDOPTS))

  PERL_EMBED_CCOPTS = `perl -MExtUtils::Embed -e ccopts 2>/dev/null`

  PERL_EMBED_CCOPTS = $(shell perl -MExtUtils::Embed -e ccopts 2>/dev/null)

  PERL_EMBED_CCOPTS := $(filter-out -specs=%,$(PERL_EMBED_CCOPTS))

  PERL_EMBED_LDOPTS := $(filter-out -specs=%,$(PERL_EMBED_LDOPTS))

  FLAGS_PERL_EMBED=$(PERL_EMBED_CCOPTS) $(PERL_EMBED_LDOPTS)



  ifneq ($(feature-libperl), 1)

tools/perf/arch/s390/include/perf_regs.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


#include <stdlib.h>

#include <linux/types.h>

#include <../../../../arch/s390/include/uapi/asm/perf_regs.h>

#include <asm/perf_regs.h>



void perf_regs_load(u64 *regs);

tools/perf/check-headers.sh

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ arch/x86/include/asm/cpufeatures.h 
arch/arm/include/uapi/asm/perf_regs.h

arch/arm64/include/uapi/asm/perf_regs.h

arch/powerpc/include/uapi/asm/perf_regs.h

arch/s390/include/uapi/asm/perf_regs.h

arch/x86/include/uapi/asm/perf_regs.h

arch/x86/include/uapi/asm/kvm.h

arch/x86/include/uapi/asm/kvm_perf.h

CRA Git | Maintained and supported by SUSTech CRA and CCSE