ARM: oprofile: Move non-ARM code into separate init/exit
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@console-pimps.org> Tested-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Robert Richter <robert.richter@amd.com>
This commit is contained in:
parent
80e96b11f6
commit
58850e210c
|
@ -349,7 +349,7 @@ static void arm_backtrace(struct pt_regs * const regs, unsigned int depth)
|
||||||
tail = user_backtrace(tail);
|
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;
|
int cpu, ret = 0;
|
||||||
|
|
||||||
|
@ -387,7 +387,6 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ops->backtrace = arm_backtrace;
|
|
||||||
ops->create_files = oprofile_perf_create_files;
|
ops->create_files = oprofile_perf_create_files;
|
||||||
ops->setup = oprofile_perf_setup;
|
ops->setup = oprofile_perf_setup;
|
||||||
ops->start = oprofile_perf_start;
|
ops->start = oprofile_perf_start;
|
||||||
|
@ -410,7 +409,14 @@ out:
|
||||||
return ret;
|
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;
|
int cpu, id;
|
||||||
struct perf_event *event;
|
struct perf_event *event;
|
||||||
|
@ -428,6 +434,11 @@ void __exit oprofile_arch_exit(void)
|
||||||
kfree(counter_config);
|
kfree(counter_config);
|
||||||
exit_driverfs();
|
exit_driverfs();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void __exit oprofile_arch_exit(void)
|
||||||
|
{
|
||||||
|
oprofile_perf_exit();
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
int __init oprofile_arch_init(struct oprofile_operations *ops)
|
int __init oprofile_arch_init(struct oprofile_operations *ops)
|
||||||
{
|
{
|
||||||
|
|
Reference in New Issue