summaryrefslogtreecommitdiffstats
path: root/kernel/events
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2016-08-15 11:42:45 +0100
committerIngo Molnar <mingo@kernel.org>2016-09-05 13:19:18 +0200
commitc9bbdd4830ab06288bb1d8c00ed8c8c6e80e377a (patch)
tree6fe8c117689f202e26815b3e4ba4e9a01e65f215 /kernel/events
parent24cf84672e0a1e0d13f3894b60cd820a0140342a (diff)
downloadlinux-stable-c9bbdd4830ab06288bb1d8c00ed8c8c6e80e377a.tar.gz
linux-stable-c9bbdd4830ab06288bb1d8c00ed8c8c6e80e377a.tar.bz2
linux-stable-c9bbdd4830ab06288bb1d8c00ed8c8c6e80e377a.zip
perf/core: Don't pass PERF_EF_START to the PMU ->start callback
PERF_EF_START is a flag to indicate to the PMU ->add() callback that, as well as claiming the PMU resources required by the event being added, it should also start the PMU. Passing this flag to the ->start() callback doesn't make sense, because ->start() always tries to start the PMU. Remove it. Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Vince Weaver <vincent.weaver@maine.edu> Cc: mark.rutland@arm.com Link: http://lkml.kernel.org/r/1471257765-29662-1-git-send-email-will.deacon@arm.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/events')
-rw-r--r--kernel/events/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c
index dff00c787867..74f22a95eb63 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -2492,7 +2492,7 @@ static int __perf_event_stop(void *info)
* while restarting.
*/
if (sd->restart)
- event->pmu->start(event, PERF_EF_START);
+ event->pmu->start(event, 0);
return 0;
}