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 <matt@xxxxxxxxxxxxxxxxx> > Tested-by: Will Deacon <will.deacon@xxxxxxx> > --- > 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. -Robert > ops->cpu_type = op_name_from_perf_id(); > > if (!ops->cpu_type) > @@ -410,7 +409,14 @@ out: > return ret; > } > > -void __exit oprofile_arch_exit(void) > +int __init oprofile_arch_init(struct oprofile_operations *ops) > +{ > + ops->backtrace = arm_backtrace; > + > + return oprofile_perf_init(ops); > +} > + > +void __exit oprofile_perf_exit(void) > { > int cpu, id; > struct perf_event *event; > @@ -428,6 +434,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 -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html