Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (162 commits)
  tracing/kprobes: unregister_trace_probe needs to be called under mutex
  perf: expose event__process function
  perf events: Fix mmap offset determination
  perf, powerpc: fsl_emb: Restore setting perf_sample_data.period
  perf, powerpc: Convert the FSL driver to use local64_t
  perf tools: Don't keep unreferenced maps when unmaps are detected
  perf session: Invalidate last_match when removing threads from rb_tree
  perf session: Free the ref_reloc_sym memory at the right place
  x86,mmiotrace: Add support for tracing STOS instruction
  perf, sched migration: Librarize task states and event headers helpers
  perf, sched migration: Librarize the GUI class
  perf, sched migration: Make the GUI class client agnostic
  perf, sched migration: Make it vertically scrollable
  perf, sched migration: Parameterize cpu height and spacing
  perf, sched migration: Fix key bindings
  perf, sched migration: Ignore unhandled task states
  perf, sched migration: Handle ignored migrate out events
  perf: New migration tool overview
  tracing: Drop cpparg() macro
  perf: Use tracepoint_synchronize_unregister() to flush any pending tracepoint call
  ...

Fix up trivial conflicts in Makefile and drivers/cpufreq/cpufreq.c

1 files changed, 10 insertions, 4 deletions

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 9a39ca3c3ac4..a6b4d44f9502 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -69,7 +69,7 @@ static struct perf_event_attr default_attrs[] = {
 };
 
 static bool                     system_wide                     =  false;
-static unsigned int             nr_cpus                         =  0;
+static int                      nr_cpus                         =  0;
 static int                      run_idx                         =  0;
 
 static int                      run_count                       =  1;
@@ -82,6 +82,7 @@ static int			thread_num			=  0;
 static pid_t                    child_pid                       = -1;
 static bool                     null_run                        =  false;
 static bool                     big_num                         =  false;
+static const char               *cpu_list;
 
 
 static int                      *fd[MAX_NR_CPUS][MAX_COUNTERS];
@@ -158,7 +159,7 @@ static int create_perf_stat_counter(int counter)
                                     PERF_FORMAT_TOTAL_TIME_RUNNING;
 
         if (system_wide) {
-                unsigned int cpu;
+                int cpu;
 
                 for (cpu = 0; cpu < nr_cpus; cpu++) {
                         fd[cpu][counter][0] = sys_perf_event_open(attr,
@@ -208,7 +209,7 @@ static inline int nsec_counter(int counter)
 static void read_counter(int counter)
 {
         u64 count[3], single_count[3];
-        unsigned int cpu;
+        int cpu;
         size_t res, nv;
         int scaled;
         int i, thread;
@@ -542,6 +543,8 @@ static const struct option options[] = {
                     "null run - dont start any counters"),
         OPT_BOOLEAN('B', "big-num", &big_num,
                     "print large numbers with thousands\' separators"),
+        OPT_STRING('C', "cpu", &cpu_list, "cpu",
+                    "list of cpus to monitor in system-wide"),
         OPT_END()
 };
 
@@ -566,10 +569,13 @@ int cmd_stat(int argc, const char **argv, const char *prefix __used)
         }
 
         if (system_wide)
-                nr_cpus = read_cpu_map();
+                nr_cpus = read_cpu_map(cpu_list);
         else
                 nr_cpus = 1;
 
+        if (nr_cpus < 1)
+                usage_with_options(stat_usage, options);
+
         if (target_pid != -1) {
                 target_tid = target_pid;
                 thread_num = find_all_tid(target_pid, &all_tids);