From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932588Ab0JFOtd (ORCPT ); Wed, 6 Oct 2010 10:49:33 -0400 Received: from tx2ehsobe001.messaging.microsoft.com ([65.55.88.11]:20584 "EHLO TX2EHSOBE001.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932440Ab0JFOtc (ORCPT ); Wed, 6 Oct 2010 10:49:32 -0400 X-SpamScore: -18 X-BigFish: VPS-18(zzbb2cK1dbaL1432N98dNzz1202hzz8275bh8275dhz32i2a8h43h61h) X-Spam-TCS-SCL: 0:0 X-WSS-ID: 0L9VII7-02-2KQ-02 X-M-MSG: Date: Wed, 6 Oct 2010 16:49:21 +0200 From: Robert Richter To: Matt Fleming CC: Will Deacon , Paul Mundt , Russell King , "linux-arm-kernel@lists.infradead.org" , "linux-sh@vger.kernel.org" , Peter Zijlstra , Ingo Molnar , Frederic Weisbecker , Arnaldo Carvalho de Melo , "linux-arch@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Deng-Cheng Zhu , Grant Likely Subject: Re: [PATCH 4/7] ARM: oprofile: Move non-ARM code into separate init/exit Message-ID: <20101006144921.GQ13563@erda.amd.com> References: <74092b0d162aafc21e408033cec6146e227363b5.1286222593.git.matt@console-pimps.org> <20101006133309.GP13563@erda.amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20101006133309.GP13563@erda.amd.com> User-Agent: Mutt/1.5.20 (2009-06-14) X-Reverse-DNS: unknown Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 06.10.10 15:33:09, Robert Richter wrote: > On 04.10.10 16:44:22, Matt Fleming wrote: > > In preparation for moving the majority of this oprofile code into an > > architecture-neutral place separate the architecture-independent code > > into oprofile_perf_init() and oprofile_perf_exit(). > > > > Signed-off-by: Matt Fleming > > Tested-by: Will Deacon > > --- > > arch/arm/oprofile/common.c | 17 ++++++++++++++--- > > 1 files changed, 14 insertions(+), 3 deletions(-) > > > > diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c > > index 86df75f..e4cd332 100644 > > --- a/arch/arm/oprofile/common.c > > +++ b/arch/arm/oprofile/common.c > > @@ -327,7 +327,7 @@ static void arm_backtrace(struct pt_regs * const regs, unsigned int depth) > > tail = user_backtrace(tail); > > } > > > > -int __init oprofile_arch_init(struct oprofile_operations *ops) > > +int __init oprofile_perf_init(struct oprofile_operations *ops) > > { > > int cpu, ret = 0; > > > > @@ -365,7 +365,6 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) > > } > > } > > > > - ops->backtrace = arm_backtrace; > > ops->create_files = oprofile_perf_create_files; > > ops->setup = oprofile_perf_setup; > > ops->start = oprofile_perf_start; > > @@ -388,7 +387,14 @@ out: > > return ret; > > } > > > > -void __exit oprofile_arch_exit(void) > > +int __init oprofile_arch_init(struct oprofile_operations *ops) > > +{ > > We should do here a: > > memset(ops, 0, sizeof(*ops)); Matt, an alternative would be to move this to oprofile_perf_init() and modify ops->backtrace afterwards, but then we will lose the function's tail call. Not sure that is better. Paul, what do you think? -Robert > > Otherwise it looks good. > > -Robert > > > + ops->backtrace = arm_backtrace; > > + > > + return oprofile_perf_init(ops); > > +} > > + > > +void __exit oprofile_perf_exit(void) > > { > > int cpu, id; > > struct perf_event *event; > > @@ -406,6 +412,11 @@ void __exit oprofile_arch_exit(void) > > kfree(counter_config); > > exit_driverfs(); > > } > > + > > +void __exit oprofile_arch_exit(void) > > +{ > > + oprofile_perf_exit(); > > +} > > #else > > int __init oprofile_arch_init(struct oprofile_operations *ops) > > { > > -- > > 1.7.1 -- Advanced Micro Devices, Inc. Operating System Research Center