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: (311 commits)
  perf tools: Add mode to build without newt support
  perf symbols: symbol inconsistency message should be done only at verbose=1
  perf tui: Add explicit -lslang option
  perf options: Type check all the remaining OPT_ variants
  perf options: Type check OPT_BOOLEAN and fix the offenders
  perf options: Check v type in OPT_U?INTEGER
  perf options: Introduce OPT_UINTEGER
  perf tui: Add workaround for slang < 2.1.4
  perf record: Fix bug mismatch with -c option definition
  perf options: Introduce OPT_U64
  perf tui: Add help window to show key associations
  perf tui: Make <- exit menus too
  perf newt: Add single key shortcuts for zoom into DSO and threads
  perf newt: Exit browser unconditionally when CTRL+C, q or Q is pressed
  perf newt: Fix the 'A'/'a' shortcut for annotate
  perf newt: Make <- exit the ui_browser
  x86, perf: P4 PMU - fix counters management logic
  perf newt: Make <- zoom out filters
  perf report: Report number of events, not samples
  perf hist: Clarify events_stats fields usage
  ...

Fix up trivial conflicts in kernel/fork.c and tools/perf/builtin-record.c

1 files changed, 18 insertions, 23 deletions

diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index 4f5a03e43444..f67bce2a83b4 100644
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -22,7 +22,7 @@
 static char                     const *input_name = "perf.data";
 
 static char                     default_sort_order[] = "avg, max, switch, runtime";
-static char                     *sort_order = default_sort_order;
+static const char               *sort_order = default_sort_order;
 
 static int                      profile_cpu = -1;
 
@@ -68,10 +68,10 @@ enum sched_event_type {
 
 struct sched_atom {
         enum sched_event_type   type;
+        int                     specific_wait;
         u64                     timestamp;
         u64                     duration;
         unsigned long           nr;
-        int                     specific_wait;
         sem_t                   *wait_sem;
         struct task_desc        *wakee;
 };
@@ -105,7 +105,7 @@ static u64			sum_runtime;
 static u64                      sum_fluct;
 static u64                      run_avg;
 
-static unsigned long            replay_repeat = 10;
+static unsigned int             replay_repeat = 10;
 static unsigned long            nr_timestamps;
 static unsigned long            nr_unordered_timestamps;
 static unsigned long            nr_state_machine_bugs;
@@ -1641,30 +1641,26 @@ static int process_sample_event(event_t *event, struct perf_session *session)
         return 0;
 }
 
-static int process_lost_event(event_t *event __used,
-                              struct perf_session *session __used)
-{
-        nr_lost_chunks++;
-        nr_lost_events += event->lost.lost;
-
-        return 0;
-}
-
 static struct perf_event_ops event_ops = {
-        .sample = process_sample_event,
-        .comm   = event__process_comm,
-        .lost   = process_lost_event,
+        .sample                 = process_sample_event,
+        .comm                   = event__process_comm,
+        .lost                   = event__process_lost,
+        .ordered_samples        = true,
 };
 
 static int read_events(void)
 {
         int err = -EINVAL;
-        struct perf_session *session = perf_session__new(input_name, O_RDONLY, 0);
+        struct perf_session *session = perf_session__new(input_name, O_RDONLY, 0, false);
         if (session == NULL)
                 return -ENOMEM;
 
-        if (perf_session__has_traces(session, "record -R"))
+        if (perf_session__has_traces(session, "record -R")) {
                 err = perf_session__process_events(session, &event_ops);
+                nr_events      = session->hists.stats.nr_events[0];
+                nr_lost_events = session->hists.stats.total_lost;
+                nr_lost_chunks = session->hists.stats.nr_events[PERF_RECORD_LOST];
+        }
 
         perf_session__delete(session);
         return err;
@@ -1790,7 +1786,7 @@ static const char * const sched_usage[] = {
 static const struct option sched_options[] = {
         OPT_STRING('i', "input", &input_name, "file",
                     "input file name"),
-        OPT_BOOLEAN('v', "verbose", &verbose,
+        OPT_INCR('v', "verbose", &verbose,
                     "be more verbose (show symbol address, etc)"),
         OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,
                     "dump raw trace in ASCII"),
@@ -1805,7 +1801,7 @@ static const char * const latency_usage[] = {
 static const struct option latency_options[] = {
         OPT_STRING('s', "sort", &sort_order, "key[,key2...]",
                    "sort by key(s): runtime, switch, avg, max"),
-        OPT_BOOLEAN('v', "verbose", &verbose,
+        OPT_INCR('v', "verbose", &verbose,
                     "be more verbose (show symbol address, etc)"),
         OPT_INTEGER('C', "CPU", &profile_cpu,
                     "CPU to profile on"),
@@ -1820,9 +1816,9 @@ static const char * const replay_usage[] = {
 };
 
 static const struct option replay_options[] = {
-        OPT_INTEGER('r', "repeat", &replay_repeat,
-                    "repeat the workload replay N times (-1: infinite)"),
-        OPT_BOOLEAN('v', "verbose", &verbose,
+        OPT_UINTEGER('r', "repeat", &replay_repeat,
+                     "repeat the workload replay N times (-1: infinite)"),
+        OPT_INCR('v', "verbose", &verbose,
                     "be more verbose (show symbol address, etc)"),
         OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,
                     "dump raw trace in ASCII"),
@@ -1850,7 +1846,6 @@ static const char *record_args[] = {
         "record",
         "-a",
         "-R",
-        "-M",
         "-f",
         "-m", "1024",
         "-c", "1",