perf_counter: Remove the last nmi/irq bits
Commit-ID: 8a016db386195b193e2a8aeddff9fe937dcb7a40 Gitweb: http://git.kernel.org/tip/8a016db386195b193e2a8aeddff9fe937dcb7a40 Author: Peter Zijlstra <[email protected]> AuthorDate: Tue, 2 Jun 2009 15:27:45 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 2 Jun 2009 21:45:31 +0200
perf_counter: Remove the last nmi/irq bits
IRQ (non-NMI) sampling is not used anymore - remove the last few bits.
Signed-off-by Peter Zijlstra <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Corey Ashford <[email protected]>
Cc Marcelo Tosatti <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc John Kacur <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/kernel/cpu/perf_counter.c | 6 ------ include/linux/perf_counter.h | 4 +--- 2 files changed, 1 insertions(+), 9 deletions(-)
arch/x86/kernel/cpu/perf_counter.c +0 -6
@@ -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
@@ -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 */