diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
| commit | b981d8b3f5e008ff10d993be633ad00564fc22cd (patch) | |
| tree | e292dc07b22308912cf6a58354a608b9e5e8e1fd /include/asm-mips/stacktrace.h | |
| parent | b11d2127c4893a7315d1e16273bc8560049fa3ca (diff) | |
| parent | 2b9e0aae1d50e880c58d46788e5e3ebd89d75d62 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/macintosh/adbhid.c
Diffstat (limited to 'include/asm-mips/stacktrace.h')
| -rw-r--r-- | include/asm-mips/stacktrace.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-mips/stacktrace.h b/include/asm-mips/stacktrace.h index 07f873351a86..0bf82818aa53 100644 --- a/include/asm-mips/stacktrace.h +++ b/include/asm-mips/stacktrace.h | |||
| @@ -9,7 +9,11 @@ extern unsigned long unwind_stack(struct task_struct *task, unsigned long *sp, | |||
| 9 | unsigned long pc, unsigned long *ra); | 9 | unsigned long pc, unsigned long *ra); |
| 10 | #else | 10 | #else |
| 11 | #define raw_show_trace 1 | 11 | #define raw_show_trace 1 |
| 12 | #define unwind_stack(task, sp, pc, ra) 0 | 12 | static inline unsigned long unwind_stack(struct task_struct *task, |
| 13 | unsigned long *sp, unsigned long pc, unsigned long *ra) | ||
| 14 | { | ||
| 15 | return 0; | ||
| 16 | } | ||
| 13 | #endif | 17 | #endif |
| 14 | 18 | ||
| 15 | static __always_inline void prepare_frametrace(struct pt_regs *regs) | 19 | static __always_inline void prepare_frametrace(struct pt_regs *regs) |