lockup_detector: Combine nmi_watchdog and softlockup detector

[karo-tx-linux.git] / arch / x86 / kernel / apic / hw_nmi.c

diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c
index e8b78a0be5ded9e6a19fbd79d88196f05bed557e..79425f96fceebbf0946478f4617778c4aba182c6 100644 (file)
--- a/arch/x86/kernel/apic/hw_nmi.c
+++ b/arch/x86/kernel/apic/hw_nmi.c
@@ -89,7 +89,7 @@ int hw_nmi_is_cpu_stuck(struct pt_regs *regs)
 
 u64 hw_nmi_get_sample_period(void)
 {
-       return cpu_khz * 1000;
+       return (u64)(cpu_khz) * 1000 * 60;
 }
 
 #ifdef ARCH_HAS_NMI_WATCHDOG