Merge tag 'v3.18-rc1' into x86/urgent

Reason:
Need to apply audit patch on top of v3.18-rc1.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

1 files changed, 0 insertions, 3 deletions

diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index 9c9287fbf8e9..891c3930080e 100644
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -1431,9 +1431,6 @@ static int perf_sched__process_tracepoint_sample(struct perf_tool *tool __maybe_
 {
         int err = 0;
 
-        evsel->hists.stats.total_period += sample->period;
-        hists__inc_nr_samples(&evsel->hists, true);
-
         if (evsel->handler != NULL) {
                 tracepoint_handler f = evsel->handler;
                 err = f(tool, evsel, sample, machine);