diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-06-04 00:40:40 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-04 00:40:40 -0400 |
| commit | ae20ea8525a80a863f70d332cf47b71bd9f54c1f (patch) | |
| tree | 9d3cedeb65db521a8436b545bd91641549a18d24 /arch/um/include/sysrq.h | |
| parent | f497ba735fc9ff4e35a19641143708b3be1c7061 (diff) | |
| parent | 8be3de3fd8469154a2b3e18a4712032dac5b4a53 (diff) | |
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
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 |