Commit ed06ef31 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

 . revert 20b279 - require exclude_guest to use PEBS - kernel side, now
   older binaries will continue working for things like cycles:pp
   without needing to pass extra modifiers, from David Ahern.

 . Fix building from 'make perf-*-src-pkg' tarballs, broken by UAPI,
   from Sebastian Andrzej Siewior

[ Pulling directly, Ingo would normally pull but has been unresponsive ]

* tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
  perf tools: Fix building from 'make perf-*-src-pkg' tarballs
  perf x86: revert 20b279 - require exclude_guest to use PEBS - kernel side
parents 343391b1 acb8fb04

arch/x86/kernel/cpu/perf_event.c

+0 −6
Original line number Diff line number Diff line
@@ -340,9 +340,6 @@ int x86_setup_perfctr(struct perf_event *event) 
		/* BTS is currently only allowed for user-mode. */

		if (!attr->exclude_kernel)

			return -EOPNOTSUPP;



		if (!attr->exclude_guest)

			return -EOPNOTSUPP;

	}



	hwc->config |= config;
@@ -385,9 +382,6 @@ int x86_pmu_hw_config(struct perf_event *event) 
	if (event->attr.precise_ip) {

		int precise = 0;



		if (!event->attr.exclude_guest)

			return -EOPNOTSUPP;



		/* Support for constant skid */

		if (x86_pmu.pebs_active && !x86_pmu.pebs_broken) {

			precise++;

tools/perf/MANIFEST

+10 −0
Original line number Diff line number Diff line
@@ -11,11 +11,21 @@ lib/rbtree.c 
include/linux/swab.h

arch/*/include/asm/unistd*.h

arch/*/include/asm/perf_regs.h

arch/*/include/uapi/asm/unistd*.h

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

arch/*/lib/memcpy*.S

arch/*/lib/memset*.S

include/linux/poison.h

include/linux/magic.h

include/linux/hw_breakpoint.h

include/linux/rbtree_augmented.h

include/uapi/linux/perf_event.h

include/uapi/linux/const.h

include/uapi/linux/swab.h

include/uapi/linux/hw_breakpoint.h

arch/x86/include/asm/svm.h

arch/x86/include/asm/vmx.h

arch/x86/include/asm/kvm_host.h

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

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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE