diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-06-01 03:37:23 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-06-01 03:37:23 -0400 |
| commit | 9d5432979951c8761c2b4517007039b9bcc1c110 (patch) | |
| tree | 9441cb1cd4a7674a2292936bfb42514f33d24cd4 /arch/um/include/sysrq.h | |
| parent | a913829e90e2af7a6e98f5aadcc9fec4dcf1ef64 (diff) | |
| parent | 21e3024cbddb712f6a078bf4132d7682d3c4e35e (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/um/include/sysrq.h')
| -rw-r--r-- | arch/um/include/sysrq.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/um/include/sysrq.h b/arch/um/include/sysrq.h index 2ce9423460b3..c8d332b56b98 100644 --- a/arch/um/include/sysrq.h +++ b/arch/um/include/sysrq.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #ifndef __UM_SYSRQ_H | 1 | #ifndef __UM_SYSRQ_H |
| 2 | #define __UM_SYSRQ_H | 2 | #define __UM_SYSRQ_H |
| 3 | 3 | ||
| 4 | extern void show_trace(unsigned long *stack); | 4 | struct task_struct; |
| 5 | extern void show_trace(struct task_struct* task, unsigned long *stack); | ||
| 5 | 6 | ||
| 6 | #endif | 7 | #endif |