- patches.fixes/patch-2.6.11-rc1: 2.6.11-rc1.

[linux-flexiantxendom0-3.2.10.git] / arch / ia64 / oprofile / init.c

diff --git a/arch/ia64/oprofile/init.c b/arch/ia64/oprofile/init.c
index 6d0c132..5acf852 100644 (file)
--- a/arch/ia64/oprofile/init.c
+++ b/arch/ia64/oprofile/init.c
@@ -12,15 +12,17 @@
 #include <linux/init.h>
 #include <linux/errno.h>
  
-extern int perfmon_init(struct oprofile_operations ** ops);
+extern int perfmon_init(struct oprofile_operations * ops);
 extern void perfmon_exit(void);
+extern void ia64_backtrace(struct pt_regs * const regs, unsigned int depth);
 
-int __init oprofile_arch_init(struct oprofile_operations ** ops)
+void __init oprofile_arch_init(struct oprofile_operations * ops)
 {
 #ifdef CONFIG_PERFMON
-       return perfmon_init(ops);
+       /* perfmon_init() can fail, but we have no way to report it */
+       perfmon_init(ops);
 #endif
-       return -ENODEV;
+       ops->backtrace = ia64_backtrace;
 }