[<prev] [next>] [day] [month] [year] [list]
Message-ID: <tip-f91183fe3780d44849110a1653dfe8af7bc67aa4@git.kernel.org>
Date: Tue, 26 May 2009 13:27:33 GMT
From: tip-bot for Mike Galbraith <efault@....de>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, acme@...hat.com, paulus@...ba.org,
hpa@...or.com, mingo@...hat.com, jkacur@...hat.com,
a.p.zijlstra@...llo.nl, efault@....de, mtosatti@...hat.com,
tglx@...utronix.de, cjashfor@...ux.vnet.ibm.com, mingo@...e.hu
Subject: [tip:perfcounters/core] perf top: Remove leftover NMI/IRQ bits
Commit-ID: f91183fe3780d44849110a1653dfe8af7bc67aa4
Gitweb: http://git.kernel.org/tip/f91183fe3780d44849110a1653dfe8af7bc67aa4
Author: Mike Galbraith <efault@....de>
AuthorDate: Tue, 26 May 2009 15:25:34 +0200
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Tue, 26 May 2009 15:25:34 +0200
perf top: Remove leftover NMI/IRQ bits
79202b removed IRQ/NMI mode selection, so remove it from
perf top as well.
[ Impact: cleanup ]
Signed-off-by: Mike Galbraith <efault@....de>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Cc: Paul Mackerras <paulus@...ba.org>
Cc: Corey Ashford <cjashfor@...ux.vnet.ibm.com>
Cc: Marcelo Tosatti <mtosatti@...hat.com>
Cc: Arnaldo Carvalho de Melo <acme@...hat.com>
Cc: John Kacur <jkacur@...hat.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
Documentation/perf_counter/builtin-top.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/Documentation/perf_counter/builtin-top.c b/Documentation/perf_counter/builtin-top.c
index 87b925c..cacaa3c 100644
--- a/Documentation/perf_counter/builtin-top.c
+++ b/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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists