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

Commit 8a016db3 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

perf_counter: Remove the last nmi/irq bits 



IRQ (non-NMI) sampling is not used anymore - remove the last few bits.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: John Kacur <jkacur@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b23f3325

arch/x86/kernel/cpu/perf_counter.c

+0 −6
Original line number Diff line number Diff line
@@ -284,12 +284,6 @@ static int __hw_perf_counter_init(struct perf_counter *counter) 
	if (!hw_event->exclude_kernel)

		hwc->config |= ARCH_PERFMON_EVENTSEL_OS;



	/*

	 * Use NMI events all the time:

	 */

	hwc->nmi	= 1;

	hw_event->nmi	= 1;



	if (!hwc->sample_period)

		hwc->sample_period = x86_pmu.max_period;

include/linux/perf_counter.h

+1 −3
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ struct perf_counter_hw_event { 
	__u64			read_format;



	__u64			disabled       :  1, /* off by default        */

				nmi	       :  1, /* NMI sampling          */

				inherit	       :  1, /* children inherit it   */

				pinned	       :  1, /* must always be on PMU */

				exclusive      :  1, /* only group on PMU     */
@@ -153,7 +152,7 @@ struct perf_counter_hw_event { 
				comm	       :  1, /* include comm data     */

				freq           :  1, /* use freq, not period  */



				__reserved_1   : 51;

				__reserved_1   : 52;



	__u32			wakeup_events;	/* wakeup every n events */

	__u32			__reserved_2;
@@ -354,7 +353,6 @@ struct hw_perf_counter { 
			u64				config;

			unsigned long			config_base;

			unsigned long			counter_base;

			int				nmi;

			int				idx;

		};

		union { /* software */