lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Browse Source 
Conflicts:
	arch/sparc/Kconfig
This commit is contained in:
David S. Miller
2009-09-11 20:35:13 -07:00
parent b73d884756 86d710146f
commit cabc5c0f7f
970 changed files with 65085 additions and 24077 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sparc/kernel/nmi.c
View File

@@ -113,7 +113,7 @@ notrace __kprobes void perfctr_irq(int irq, struct pt_regs *regs)
}
if (!touched && __get_cpu_var(last_irq_sum) == sum) {
local_inc(&__get_cpu_var(alert_counter));
if (local_read(&__get_cpu_var(alert_counter)) == 5 * nmi_hz)
if (local_read(&__get_cpu_var(alert_counter)) == 30 * nmi_hz)
die_nmi("BUG: NMI Watchdog detected LOCKUP",
regs, panic_on_timeout);
} else {