diff --git a/[refs] b/[refs] index de6549880bda..9ca10acebebd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5438582090406e2ccb4169d9b2df7c9939ae42b +refs/heads/master: a204458acb358c147618c749ba0fac8ef2c5d4e6 diff --git a/trunk/include/asm-mips/stacktrace.h b/trunk/include/asm-mips/stacktrace.h index 87bd7caec1cf..0bf82818aa53 100644 --- a/trunk/include/asm-mips/stacktrace.h +++ b/trunk/include/asm-mips/stacktrace.h @@ -12,6 +12,7 @@ extern unsigned long unwind_stack(struct task_struct *task, unsigned long *sp, static inline unsigned long unwind_stack(struct task_struct *task, unsigned long *sp, unsigned long pc, unsigned long *ra) { + return 0; } #endif