vserver 1.9.5.x5

[linux-2.6.git] / arch / i386 / oprofile / init.c

diff --git a/arch/i386/oprofile/init.c b/arch/i386/oprofile/init.c
index 1b7747c..c90332d 100644 (file)
--- a/arch/i386/oprofile/init.c
+++ b/arch/i386/oprofile/init.c
@@ -15,21 +15,27 @@
  * with the NMI mode driver.
  */
  
-extern int nmi_init(struct oprofile_operations ** ops);
-extern int nmi_timer_init(struct oprofile_operations **ops);
+extern int nmi_init(struct oprofile_operations * ops);
+extern int nmi_timer_init(struct oprofile_operations * ops);
 extern void nmi_exit(void);
+extern void x86_backtrace(struct pt_regs * const regs, unsigned int depth);
 
-int __init oprofile_arch_init(struct oprofile_operations ** ops)
+
+int __init oprofile_arch_init(struct oprofile_operations * ops)
 {
-       int ret = -ENODEV;
+       int ret;
+
+       ret = -ENODEV;
+
 #ifdef CONFIG_X86_LOCAL_APIC
        ret = nmi_init(ops);
 #endif
-
 #ifdef CONFIG_X86_IO_APIC
        if (ret < 0)
                ret = nmi_timer_init(ops);
 #endif
+       ops->backtrace = x86_backtrace;
+
        return ret;
 }