diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-08 17:56:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-08 17:56:41 -0400 |
| commit | 4dd565134ece7e5d528d4c5288879310c54419e9 (patch) | |
| tree | e08910d2d0feae0c030f8f01acc9b03eb760ad9a /include/linux/stacktrace.h | |
| parent | 071d7ab6649eb34a873a53e71635186e9117101d (diff) | |
| parent | 69849375d6b13e94d08cdc94b49b11fbab454a0e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/netdev.c
Diffstat (limited to 'include/linux/stacktrace.h')
| -rw-r--r-- | include/linux/stacktrace.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/stacktrace.h b/include/linux/stacktrace.h index 5da9794b2d78..b106fd8e0d5c 100644 --- a/include/linux/stacktrace.h +++ b/include/linux/stacktrace.h | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | #ifndef __LINUX_STACKTRACE_H | 1 | #ifndef __LINUX_STACKTRACE_H |
| 2 | #define __LINUX_STACKTRACE_H | 2 | #define __LINUX_STACKTRACE_H |
| 3 | 3 | ||
| 4 | struct task_struct; | ||
| 5 | |||
| 4 | #ifdef CONFIG_STACKTRACE | 6 | #ifdef CONFIG_STACKTRACE |
| 5 | struct stack_trace { | 7 | struct stack_trace { |
| 6 | unsigned int nr_entries, max_entries; | 8 | unsigned int nr_entries, max_entries; |