From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751985AbcCAC5c (ORCPT ); Mon, 29 Feb 2016 21:57:32 -0500 Received: from mail333.us4.mandrillapp.com ([205.201.137.77]:48919 "EHLO mail333.us4.mandrillapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751643AbcCAC4W (ORCPT ); Mon, 29 Feb 2016 21:56:22 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; q=dns; s=mandrill; d=linuxfoundation.org; b=OSBU6DvGCv4Svy5duZqvpHpHnWlgDn2Ah+dRhgO8rW3vljukuZT436bMJV/FI0Pm2B2r9N3ZQVCh urwZNyyG3b65sH6/ZRNcKY9t9nSckg7BBUIEGqMvwB4FgbiehWWK9+1u8MHge0ddLH9dy5RF8Za5 dLm1BjQD8JEqnJ1ZUR4=; From: Greg Kroah-Hartman Subject: Re: [PATCH] drivers/hwtracing: make coresight-etm-perf.c explicitly non-modular To: Mathieu Poirier Cc: Paul Gortmaker , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , Alexander Shishkin Message-Id: <20160301025620.GA17542@kroah.com> References: <1456604507-4728-1-git-send-email-paul.gortmaker@windriver.com> In-Reply-To: X-Report-Abuse: Please forward a copy of this message, including all headers, to abuse@mandrill.com X-Report-Abuse: You can also report abuse here: http://mandrillapp.com/contact/abuse?id=30481620.430d4740e50d44099f5637c9194474b2 X-Mandrill-User: md_30481620 Date: Tue, 01 Mar 2016 02:56:21 +0000 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Feb 29, 2016 at 09:10:06AM -0700, Mathieu Poirier wrote: > On 27 February 2016 at 13:21, Paul Gortmaker > wrote: > > In commit 941943cf519f7cacbbcecee5c4ef4b77b466bd5c ("drivers/hwtracing: > > make coresight-* explicitly non-modular") we removed all uses of > > modular functions/macros in favour of their built-in equivlents in > > this subsystem. > > > > However that commit and commit 0bcbf2e30ff2271b54f54c8697a185f7d86ec6e4 > > ("coresight: etm-perf: new PMU driver for ETM tracers") were in flight > > at the same time, and hence one new non-modular user of module_init > > crept back in. Fix it up like we did all the others. > > > > Since module_init translates to device_initcall in the non-modular > > case, the init ordering remains unchanged with this commit. > > > > Cc: Alexander Shishkin > > Cc: Mathieu Poirier > > Cc: Greg Kroah-Hartman > > Signed-off-by: Paul Gortmaker > > --- > > drivers/hwtracing/coresight/coresight-etm-perf.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c > > index 36153a77e982..755125f7917f 100644 > > --- a/drivers/hwtracing/coresight/coresight-etm-perf.c > > +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c > > @@ -21,7 +21,7 @@ > > #include > > #include > > #include > > -#include > > +#include > > #include > > #include > > #include > > @@ -390,4 +390,4 @@ static int __init etm_perf_init(void) > > > > return ret; > > } > > -module_init(etm_perf_init); > > +device_initcall(etm_perf_init); > > Yes of course - Applied. > > Greg, given the triviality of the changes, can you still pick this up > for the next merge window? Yes, want me to take it directly, or do you have more patches to send me? thanks, greg k-h