diff mbox

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

Message ID 74092b0d162aafc21e408033cec6146e227363b5.1286222593.git.matt@console-pimps.org (mailing list archive)
State Not Applicable
Headers show

Commit Message

Matt Fleming Oct. 4, 2010, 8:44 p.m. UTC 
None
diff mbox

Patch

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)
+{
+	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)
 {