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@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
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: John Kacur <jkacur@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/Documentation/perf_counter/builtin-top.c b/Documentation/perf_counter/builtin-top.c
index 87b925c..cacaa3c 100644 (file)
--- 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;