Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c749b3e9 authored by Alexander Shishkin's avatar Alexander Shishkin Committed by Ingo Molnar
Browse files

perf/x86/intel/lbr: Kill off intel_pmu_needs_lbr_smpl for good 



The x86_lbr_exclusive commit (48070342 "perf/x86: Mark Intel PT and
LBR/BTS as mutually exclusive") mistakenly moved intel_pmu_needs_lbr_smpl()
to perf_event.h, while another commit (a46a2300 "perf: Simplify the
branch stack check") removed it in favor of needs_branch_stack().

This patch gets rid of intel_pmu_needs_lbr_smpl() for good.

Signed-off-by: default avatarAlexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: acme@infradead.org
Cc: adrian.hunter@intel.com
Cc: hpa@zytor.com
Link: http://lkml.kernel.org/r/1435140349-32588-3-git-send-email-alexander.shishkin@linux.intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent e9b3bd37

arch/x86/kernel/cpu/perf_event.h

+0 −14
Original line number Diff line number Diff line
@@ -808,20 +808,6 @@ static inline int amd_pmu_init(void) 


#ifdef CONFIG_CPU_SUP_INTEL



static inline bool intel_pmu_needs_lbr_smpl(struct perf_event *event)

{

	/* user explicitly requested branch sampling */

	if (has_branch_stack(event))

		return true;



	/* implicit branch sampling to correct PEBS skid */

	if (x86_pmu.intel_cap.pebs_trap && event->attr.precise_ip > 1 &&

	    x86_pmu.intel_cap.pebs_format < 2)

		return true;



	return false;

}



static inline bool intel_pmu_has_bts(struct perf_event *event)

{

	if (event->attr.config == PERF_COUNT_HW_BRANCH_INSTRUCTIONS &&