diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-02 11:39:11 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-02 11:39:11 -0400 |
| commit | 1c3f45ab2f7f879ea482501c83899505c31f7539 (patch) | |
| tree | 672465b3b9b3e2e26a8caf74ed64aa6885c52c13 /arch/um/include/sysrq.h | |
| parent | 4bcff1b37e7c3aed914d1ce5b45994adc7dbf455 (diff) | |
| parent | e0d6d71440a3a35c6fc2dde09f8e8d4d7bd44dda (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 |