From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Fleming Subject: Re: [PATCH 5/7] ARM: oprofile: Move non-ARM code into separate init/exit Date: Sat, 9 Oct 2010 11:32:43 +0100 Message-ID: <20101009103242.GA17466@console-pimps.org> References: <0de9eda11dbfe9c21348da07b57f04f35cd9effc.1286584677.git.matt@console-pimps.org> <20101009012647.GM13563@erda.amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from arkanian.console-pimps.org ([212.110.184.194]:56530 "EHLO arkanian.console-pimps.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754497Ab0JIKcq (ORCPT ); Sat, 9 Oct 2010 06:32:46 -0400 Content-Disposition: inline In-Reply-To: <20101009012647.GM13563@erda.amd.com> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Robert Richter 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 On Sat, Oct 09, 2010 at 03:26:47AM +0200, Robert Richter wrote: > On 08.10.10 20:46:20, 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 | 27 +++++++++++++++++++-------- > > 1 files changed, 19 insertions(+), 8 deletions(-) > > > > diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c > > index fd6e323..8718311 100644 > > --- a/arch/arm/oprofile/common.c > > +++ b/arch/arm/oprofile/common.c > > @@ -349,7 +349,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; > > > > @@ -387,12 +387,11 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) > > } > > } > > > > - ops->backtrace = arm_backtrace; > > - ops->create_files = op_arm_create_files; > > - ops->setup = op_arm_setup; > > - ops->start = op_arm_start; > > - ops->stop = op_arm_stop; > > - ops->shutdown = op_arm_stop; > > + ops->create_files = oprofile_perf_create_files; > > + ops->setup = oprofile_perf_setup; > > + ops->start = oprofile_perf_start; > > + ops->stop = oprofile_perf_stop; > > + ops->shutdown = oprofile_perf_stop; > > There is a compile breakage caused by patch #4. Will move the renames > to patch #4 when applying the patch. Sorry, I don't know how this happened. These renames were originally in patch #4 but seem to have moved into #5 when I was reshuffling stuff.