diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-11 20:15:55 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-11 20:15:55 (GMT) |
| commit | 989aa44a5f215427085ccfe65c1e378e3399c9eb (patch) | |
| tree | cd1993f2187e17e0e8d46d4fe12848e7be21fe96 /arch/x86/include | |
| parent | 4004f02d7af9bb1f5fd993fba60ed5bd0f5397a9 (diff) | |
| parent | 47cab6a722d44c71c4f8224017ef548522243cf4 (diff) | |
| download | linux-989aa44a5f215427085ccfe65c1e378e3399c9eb.tar.xz | |
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/x86/include')
| -rw-r--r-- | arch/x86/include/asm/nmi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h index c86e5ed4..e63cf7d 100644 --- a/arch/x86/include/asm/nmi.h +++ b/arch/x86/include/asm/nmi.h @@ -45,8 +45,8 @@ extern int proc_nmi_enabled(struct ctl_table *, int , struct file *, void __user *, size_t *, loff_t *); extern int unknown_nmi_panic; -void __trigger_all_cpu_backtrace(void); -#define trigger_all_cpu_backtrace() __trigger_all_cpu_backtrace() +void arch_trigger_all_cpu_backtrace(void); +#define arch_trigger_all_cpu_backtrace arch_trigger_all_cpu_backtrace static inline void localise_nmi_watchdog(void) { |