[PATCH 4/7] ARM: oprofile: Move non-ARM code into separate init/exit

[Robert Richter]

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 <matt at console-pimps.org>
> > Tested-by: Will Deacon <will.deacon at arm.com>
> > ---
> >  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