Module Name: src
Committed By: martin
Date: Tue Jun 9 12:10:08 UTC 2015
Modified Files:
src/sys/arch/mips/cavium: octeon_cpunode.c
Log Message:
Reenable preemption before returning an error when trying to set the
watchdog to an invalid period.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/cavium/octeon_cpunode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/cavium/octeon_cpunode.c
diff -u src/sys/arch/mips/cavium/octeon_cpunode.c:1.3 src/sys/arch/mips/cavium/octeon_cpunode.c:1.4
--- src/sys/arch/mips/cavium/octeon_cpunode.c:1.3 Sat Jun 6 21:44:16 2015
+++ src/sys/arch/mips/cavium/octeon_cpunode.c Tue Jun 9 12:10:08 2015
@@ -373,6 +373,7 @@ wdog_cpunode_setmode(struct sysmon_wdog
// doesn't overflow a 32-bit value, we are fine. We write the
// 16-bits of the 32-bit period.
if ((wdog_len >> 32) != 0) {
+ kpreempt_enable();
return EINVAL;
}
sc->sc_wdog_period = smw->smw_period;
