Merge git://git.infradead.org/~dwmw2/mtd-2.6.26

[mv-sheeva.git] / include / asm-mips / stacktrace.h

diff --git a/include/asm-mips/stacktrace.h b/include/asm-mips/stacktrace.h
index 231f6f897a61a1a4ff1932fd44c631ec5000c330..0bf82818aa53d9abe10a75c86e7c40c240d957d5 100644 (file)
--- a/include/asm-mips/stacktrace.h
+++ b/include/asm-mips/stacktrace.h
@@ -6,10 +6,14 @@
 #ifdef CONFIG_KALLSYMS
 extern int raw_show_trace;
 extern unsigned long unwind_stack(struct task_struct *task, unsigned long *sp,
-                                 unsigned long pc, unsigned long ra);
+                                 unsigned long pc, unsigned long *ra);
 #else
 #define raw_show_trace 1
-#define unwind_stack(task, sp, pc, ra) 0
+static inline unsigned long unwind_stack(struct task_struct *task,
+       unsigned long *sp, unsigned long pc, unsigned long *ra)
+{
+       return 0;
+}
 #endif
 
 static __always_inline void prepare_frametrace(struct pt_regs *regs)