aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2009-06-02 15:27:45 +0200
committerIngo Molnar <mingo@elte.hu>2009-06-02 21:45:31 +0200
commit8a016db386195b193e2a8aeddff9fe937dcb7a40 (patch)
tree0394b2d9c2723221a50766077b7a5fa32e80f833
parentb23f3325ed465f1bd914384884269af0d106778c (diff)
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 <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: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/cpu/perf_counter.c6
-rw-r--r--include/linux/perf_counter.h4
2 files changed, 1 insertions, 9 deletions
diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c
index ec06aa5e928..9e144fbebd2 100644
--- a/arch/x86/kernel/cpu/perf_counter.c
+++ b/arch/x86/kernel/cpu/perf_counter.c
@@ -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;
diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h
index 1fcd3cc9385..cef9931793f 100644
--- a/include/linux/perf_counter.h
+++ b/include/linux/perf_counter.h
@@ -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 */