From 360d5e2df1288a8e73a11852ccb25a07c009598b Mon Sep 17 00:00:00 2001 From: Mike Galbraith Date: Tue, 26 May 2009 15:25:34 +0200 Subject: [PATCH] --- yaml --- r: 147528 b: refs/heads/master c: f91183fe3780d44849110a1653dfe8af7bc67aa4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/perf_counter/builtin-top.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f9bcf530c555..3862a3b54c55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0bec253c813fbb067db4dfd9f5b6cec1bd2ef026 +refs/heads/master: f91183fe3780d44849110a1653dfe8af7bc67aa4 diff --git a/trunk/Documentation/perf_counter/builtin-top.c b/trunk/Documentation/perf_counter/builtin-top.c index 87b925c8f8e8..cacaa3c2518d 100644 --- a/trunk/Documentation/perf_counter/builtin-top.c +++ b/trunk/Documentation/perf_counter/builtin-top.c @@ -8,7 +8,7 @@ Sample output: ------------------------------------------------------------------------------ - KernelTop: 2669 irqs/sec [NMI, cache-misses/cache-refs], (all, cpu: 2) + KernelTop: 2669 irqs/sec [cache-misses/cache-refs], (all, cpu: 2) ------------------------------------------------------------------------------ weight RIP kernel function @@ -92,7 +92,6 @@ static __u64 count_filter = 100; static int target_pid = -1; static int profile_cpu = -1; static int nr_cpus = 0; -static int nmi = 1; static unsigned int realtime_prio = 0; static int group = 0; static unsigned int page_size; @@ -198,10 +197,9 @@ static void print_sym_table(void) printf( "------------------------------------------------------------------------------\n"); - printf( " KernelTop:%8.0f irqs/sec kernel:%4.1f%% [%s, ", + printf( " KernelTop:%8.0f irqs/sec kernel:%4.1f%% [", events_per_sec, - 100.0 - (100.0*((events_per_sec-kevents_per_sec)/events_per_sec)), - nmi ? "NMI" : "IRQ"); + 100.0 - (100.0*((events_per_sec-kevents_per_sec)/events_per_sec))); if (nr_counters == 1) printf("%d ", event_count[0]); @@ -637,7 +635,7 @@ static int __cmd_top(void) hw_event.config = event_id[counter]; hw_event.irq_period = event_count[counter]; hw_event.record_type = PERF_RECORD_IP | PERF_RECORD_TID; - hw_event.nmi = nmi; + hw_event.nmi = 1; hw_event.mmap = use_mmap; hw_event.munmap = use_munmap; hw_event.freq = freq;