git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
debug lockups: Improve lockup detection, fix generic arch fallback
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
nmi.h
diff --git
a/arch/x86/include/asm/nmi.h
b/arch/x86/include/asm/nmi.h
index
c45a0a5
..
e63cf7d
100644
(file)
--- 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 __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)
{
static inline void localise_nmi_watchdog(void)
{
@@
-64,7
+64,7
@@
static inline int nmi_watchdog_active(void)
* but since they are power of two we could use a
* cheaper way --cvg
*/
* but since they are power of two we could use a
* cheaper way --cvg
*/
- return nmi_watchdog &
0x3
;
+ return nmi_watchdog &
(NMI_LOCAL_APIC | NMI_IO_APIC)
;
}
#endif
}
#endif
@@
-72,7
+72,6
@@
void lapic_watchdog_stop(void);
int lapic_watchdog_init(unsigned nmi_hz);
int lapic_wd_event(unsigned nmi_hz);
unsigned lapic_adjust_nmi_hz(unsigned hz);
int lapic_watchdog_init(unsigned nmi_hz);
int lapic_wd_event(unsigned nmi_hz);
unsigned lapic_adjust_nmi_hz(unsigned hz);
-int lapic_watchdog_ok(void);
void disable_lapic_nmi_watchdog(void);
void enable_lapic_nmi_watchdog(void);
void stop_nmi(void);
void disable_lapic_nmi_watchdog(void);
void enable_lapic_nmi_watchdog(void);
void stop_nmi(void);