diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-10 16:43:04 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-10 16:43:04 +1000 |
| commit | e7eb44d1b11c11de19daf4a2a032494d1a9bd27c (patch) | |
| tree | 2f5f2dbe5288471e247c6700485d2351530a5d2a /include/linux/stacktrace.h | |
| parent | dd0cef1a1bee05543b5821c4664e353369f252de (diff) | |
| parent | 8f859e1d843b10de912af02dc9cc54742c43f3e8 (diff) | |
Merge commit 'kmemcheck/auto-kmemcheck-next'
Conflicts:
arch/x86/mm/fault.c
include/linux/ring_buffer.h
include/linux/slab.h
kernel/trace/ring_buffer.c
mm/Makefile
mm/slab.c
mm/slub.c
Diffstat (limited to 'include/linux/stacktrace.h')
| -rw-r--r-- | include/linux/stacktrace.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/stacktrace.h b/include/linux/stacktrace.h index 1a8cecc4f38c..51efbef38fb0 100644 --- a/include/linux/stacktrace.h +++ b/include/linux/stacktrace.h @@ -4,6 +4,8 @@ struct task_struct; #ifdef CONFIG_STACKTRACE +struct task_struct; + struct stack_trace { unsigned int nr_entries, max_entries; unsigned long *entries; @@ -11,6 +13,7 @@ struct stack_trace { }; extern void save_stack_trace(struct stack_trace *trace); +extern void save_stack_trace_bp(struct stack_trace *trace, unsigned long bp); extern void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace); |