On Fri, Apr 03, 2020 at 01:18:57PM +0100, Lee Jones wrote: > From: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx> > > [ Upstream commit f25d8ba9e1b204b90fbf55970ea6e68955006068 ] > > A comment is in a wrong place in perf_event_create_kernel_counter(). > Fix that. > > Signed-off-by: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx> > Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> > Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> > Cc: David Ahern <dsahern@xxxxxxxxx> > Cc: Jiri Olsa <jolsa@xxxxxxxxxx> > Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> > Cc: Mark Rutland <mark.rutland@xxxxxxx> > Cc: Namhyung Kim <namhyung@xxxxxxxxxx> > Cc: Stephane Eranian <eranian@xxxxxxxxxx> > Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > Cc: Vince Weaver <vincent.weaver@xxxxxxxxx> > Link: https://lkml.kernel.org/r/20191030134731.5437-2-alexander.shishkin@xxxxxxxxxxxxxxx > Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> > Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx> > --- > kernel/events/core.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/kernel/events/core.c b/kernel/events/core.c > index 8c70ee23fbe91..16f268475e8e4 100644 > --- a/kernel/events/core.c > +++ b/kernel/events/core.c > @@ -10954,10 +10954,6 @@ perf_event_create_kernel_counter(struct perf_event_attr *attr, int cpu, > struct perf_event *event; > int err; > > - /* > - * Get the target context (task or percpu): > - */ > - > event = perf_event_alloc(attr, cpu, task, NULL, NULL, > overflow_handler, context, -1); > if (IS_ERR(event)) { > @@ -10968,6 +10964,9 @@ perf_event_create_kernel_counter(struct perf_event_attr *attr, int cpu, > /* Mark owner so we could distinguish it from user events. */ > event->owner = TASK_TOMBSTONE; > > + /* > + * Get the target context (task or percpu): > + */ > ctx = find_get_context(event->pmu, task, event); > if (IS_ERR(ctx)) { > err = PTR_ERR(ctx); Unless this is needed by a follow-on patch, I kind of doubt thsi is needed in a stable kernel release :) thanks, greg k-h
