diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-11 16:15:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-11 16:15:55 -0400 |
| commit | 989aa44a5f215427085ccfe65c1e378e3399c9eb (patch) | |
| tree | cd1993f2187e17e0e8d46d4fe12848e7be21fe96 /arch/sparc/include/asm | |
| parent | 4004f02d7af9bb1f5fd993fba60ed5bd0f5397a9 (diff) | |
| parent | 47cab6a722d44c71c4f8224017ef548522243cf4 (diff) | |
Merge branch 'core-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
debug lockups: Improve lockup detection, fix generic arch fallback
debug lockups: Improve lockup detection
Diffstat (limited to 'arch/sparc/include/asm')
| -rw-r--r-- | arch/sparc/include/asm/irq_64.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/irq_64.h b/arch/sparc/include/asm/irq_64.h index 1934f2cbf513..a0b443cb3c1f 100644 --- a/arch/sparc/include/asm/irq_64.h +++ b/arch/sparc/include/asm/irq_64.h | |||
| @@ -89,8 +89,8 @@ static inline unsigned long get_softint(void) | |||
| 89 | return retval; | 89 | return retval; |
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | void __trigger_all_cpu_backtrace(void); | 92 | void arch_trigger_all_cpu_backtrace(void); |
| 93 | #define trigger_all_cpu_backtrace() __trigger_all_cpu_backtrace() | 93 | #define arch_trigger_all_cpu_backtrace arch_trigger_all_cpu_backtrace |
| 94 | 94 | ||
| 95 | extern void *hardirq_stack[NR_CPUS]; | 95 | extern void *hardirq_stack[NR_CPUS]; |
| 96 | extern void *softirq_stack[NR_CPUS]; | 96 | extern void *softirq_stack[NR_CPUS]; |