From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1D08C43331 for ; Fri, 3 Apr 2020 12:26:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 822622073B for ; Fri, 3 Apr 2020 12:26:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=kroah.com header.i=@kroah.com header.b="WQrWsgIY"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="lPOznT+H" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728140AbgDCM0N (ORCPT ); Fri, 3 Apr 2020 08:26:13 -0400 Received: from new4-smtp.messagingengine.com ([66.111.4.230]:54311 "EHLO new4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727927AbgDCM0M (ORCPT ); Fri, 3 Apr 2020 08:26:12 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailnew.nyi.internal (Postfix) with ESMTP id 502C458016A; Fri, 3 Apr 2020 08:26:11 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Fri, 03 Apr 2020 08:26:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm3; bh=4X1yBFS5VM7YxjSUJmROxEr0L14 Qzk9bfmsDO9Klaj8=; b=WQrWsgIYvsTlSp2AEEopRisEXWage0X6F1yz/tM4EYi 4iogun3QUP8ft5xYDIfYxPqvbErj7JYon4O1pUI6VB5BhqgSAjKYXvcgV+dkIXZK wa/e48l6xxtj+sH6n7YLvYKYzRuTzeb2W78pEVQl/6+IsZSwsHtTQWzy4gN01FOB XurrWsqJTraQVd+GSV62zASjNcjEWN37nTAWKcprbpGlPI7yew8ZTUUL+p3LjCq5 xtU6lrqBbRrecenryeHmMh54Hrq4JA04507hZM+HT9woU6d69bZgYvHCSAw47XX/ BeDky1SjacT36kr2l85Oh1M3k2UAzjO2APfL5dtwXjA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=4X1yBF S5VM7YxjSUJmROxEr0L14Qzk9bfmsDO9Klaj8=; b=lPOznT+Hx+Rarj5yDcGxc/ AfwkCUjSbfu6B9ORWzy8uKWgVMRRrKini/FGVZCQwhJEGk8l8MVY77XvmJCaXcbh xTCsSbtFlTH3sb7sRE9SxkpXfvZ7pv22lOwv9ScQh/6OuKb3a/MSY/d125PLr41y LdWvVZm+SjPLCFDLyWlMZPPPzYPqRHhXcdZXXgQU/NFphB8tO7gdHANycsVB69hm 810nW+UfI0dbxX+oxUnekG3SeGsmb6Aa9wy3M9xfafjc8ctTWrUwQbHP+EjoKr7S 0k+UtQmEkvIscJabGYwPO0SkdanY8/2NaWl8oJ9NLATPbE3vGDdyF0ap0CLfVxCA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrtdeigdehvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepifhrvghgucfm jfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecuffhomhgrihhnpehkvghrnhgvlhdroh hrghenucfkphepkeefrdekiedrkeelrddutdejnecuvehluhhsthgvrhfuihiivgeptden ucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorghhrdgtohhm X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 49C10328005D; Fri, 3 Apr 2020 08:26:09 -0400 (EDT) Date: Fri, 3 Apr 2020 14:26:04 +0200 From: Greg KH To: Lee Jones Cc: stable@vger.kernel.org, Alexander Shishkin , Peter Zijlstra , Arnaldo Carvalho de Melo , David Ahern , Jiri Olsa , Linus Torvalds , Mark Rutland , Namhyung Kim , Stephane Eranian , Thomas Gleixner , Vince Weaver , Ingo Molnar Subject: Re: [PATCH 4.19 11/13] perf/core: Reattach a misplaced comment Message-ID: <20200403122604.GA3928660@kroah.com> References: <20200403121859.901838-1-lee.jones@linaro.org> <20200403121859.901838-12-lee.jones@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200403121859.901838-12-lee.jones@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Fri, Apr 03, 2020 at 01:18:57PM +0100, Lee Jones wrote: > From: Alexander Shishkin > > [ Upstream commit f25d8ba9e1b204b90fbf55970ea6e68955006068 ] > > A comment is in a wrong place in perf_event_create_kernel_counter(). > Fix that. > > Signed-off-by: Alexander Shishkin > Signed-off-by: Peter Zijlstra (Intel) > Cc: Arnaldo Carvalho de Melo > Cc: David Ahern > Cc: Jiri Olsa > Cc: Linus Torvalds > Cc: Mark Rutland > Cc: Namhyung Kim > Cc: Stephane Eranian > Cc: Thomas Gleixner > Cc: Vince Weaver > Link: https://lkml.kernel.org/r/20191030134731.5437-2-alexander.shishkin@linux.intel.com > Signed-off-by: Ingo Molnar > Signed-off-by: Lee Jones > --- > 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