diff options
| author | Joel Becker <jlbec@evilplan.org> | 2011-08-22 00:02:57 -0400 |
|---|---|---|
| committer | Joel Becker <jlbec@evilplan.org> | 2011-08-22 00:02:57 -0400 |
| commit | 99b1bb61b225c3eb4d3b196d4f1d041695b19a7e (patch) | |
| tree | 06cabdc34538f3b38a39e3b802ecc1a2ab2aae00 /include/linux/stacktrace.h | |
| parent | c7e25e6e0b0486492c5faaf6312b37413642c48e (diff) | |
| parent | 93862d5e1ab875664c6cc95254fc365028a48bb1 (diff) | |
Merge branch 'mw-3.1-jul25' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-fixes
Diffstat (limited to 'include/linux/stacktrace.h')
| -rw-r--r-- | include/linux/stacktrace.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/stacktrace.h b/include/linux/stacktrace.h index 25310f1d7f37..115b570e3bff 100644 --- a/include/linux/stacktrace.h +++ b/include/linux/stacktrace.h | |||
| @@ -14,8 +14,8 @@ struct stack_trace { | |||
| 14 | }; | 14 | }; |
| 15 | 15 | ||
| 16 | extern void save_stack_trace(struct stack_trace *trace); | 16 | extern void save_stack_trace(struct stack_trace *trace); |
| 17 | extern void save_stack_trace_regs(struct stack_trace *trace, | 17 | extern void save_stack_trace_regs(struct pt_regs *regs, |
| 18 | struct pt_regs *regs); | 18 | struct stack_trace *trace); |
| 19 | extern void save_stack_trace_tsk(struct task_struct *tsk, | 19 | extern void save_stack_trace_tsk(struct task_struct *tsk, |
| 20 | struct stack_trace *trace); | 20 | struct stack_trace *trace); |
| 21 | 21 | ||