aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/oprofile/common.c
diff options
context:
space:
mode:
authorMatt Fleming <matt@console-pimps.org>2010-09-27 20:35:29 +0100
committerRobert Richter <robert.richter@amd.com>2010-10-11 17:46:15 +0200
commit58850e210cd207399cf6461326e322541b2ec81c (patch)
tree7649e9ebcb30c0e9347cb39b9f3e9006e898717d /arch/arm/oprofile/common.c
parent80e96b11f6cd261e1e569f3931604d656388af33 (diff)
downloadlinux-linaro-stable-58850e210cd207399cf6461326e322541b2ec81c.tar.gz
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>
Diffstat (limited to 'arch/arm/oprofile/common.c')
-rw-r--r--arch/arm/oprofile/common.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c
index d18c9f3fcffb..8718311cb530 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,7 +387,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;
@@ -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)
{