Merge branch 'fixes' into for-linus

[linux-2.6-omap-h63xx.git] / arch / avr32 / oprofile / op_model_avr32.c

diff --git a/arch/avr32/oprofile/op_model_avr32.c b/arch/avr32/oprofile/op_model_avr32.c
index e2f876bfc86bbcab43be6cd47306a962e3140068..a3e9b3c4845a50f0fc53bf164923a084650f5c17 100644 (file)
--- a/arch/avr32/oprofile/op_model_avr32.c
+++ b/arch/avr32/oprofile/op_model_avr32.c
@@ -16,13 +16,14 @@
 #include <linux/sched.h>
 #include <linux/types.h>
 
-#include <asm/intc.h>
 #include <asm/sysreg.h>
 #include <asm/system.h>
 
 #define AVR32_PERFCTR_IRQ_GROUP        0
 #define AVR32_PERFCTR_IRQ_LINE 1
 
+void avr32_backtrace(struct pt_regs * const regs, unsigned int depth);
+
 enum { PCCNT, PCNT0, PCNT1, NR_counter };
 
 struct avr32_perf_counter {
@@ -224,6 +225,8 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
        memcpy(ops, &avr32_perf_counter_ops,
                        sizeof(struct oprofile_operations));
 
+       ops->backtrace = avr32_backtrace;
+
        printk(KERN_INFO "oprofile: using AVR32 performance monitoring.\n");
 
        return 0;