Module Name: src
Committed By: martin
Date: Tue Mar 18 12:54:29 UTC 2014
Modified Files:
src/sys/arch/arm/gemini: gemini_timer.c
Log Message:
Bracket timer_init() with disable_interrupts()/restore_interrupts()
properly. Pointed out by Chris Gilbert.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/gemini/gemini_timer.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/arm/gemini/gemini_timer.c
diff -u src/sys/arch/arm/gemini/gemini_timer.c:1.6 src/sys/arch/arm/gemini/gemini_timer.c:1.7
--- src/sys/arch/arm/gemini/gemini_timer.c:1.6 Sun Mar 9 10:33:23 2014
+++ src/sys/arch/arm/gemini/gemini_timer.c Tue Mar 18 12:54:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_timer.c,v 1.6 2014/03/09 10:33:23 martin Exp $ */
+/* $NetBSD: gemini_timer.c,v 1.7 2014/03/18 12:54:29 martin Exp $ */
/* adapted from:
* NetBSD: omap2_geminitmr.c,v 1.1 2008/08/27 11:03:10 matt Exp
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_timer.c,v 1.6 2014/03/09 10:33:23 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_timer.c,v 1.7 2014/03/18 12:54:29 martin Exp $");
#include "opt_gemini.h"
#include "opt_cpuoptions.h"
@@ -257,7 +257,9 @@ statintr(void *frame)
static void
timer_init(geminitmr_softc_t *sc, int schz, boolean_t autoload, boolean_t intr)
{
- disable_interrupts(I32_bit);
+ int psw;
+
+ psw = disable_interrupts(I32_bit);
timer_factors(sc, schz, autoload);
_timer_stop(sc);
_timer_intr_dis(sc);
@@ -265,7 +267,7 @@ timer_init(geminitmr_softc_t *sc, int sc
if (intr)
_timer_intr_enb(sc);
_timer_start(sc);
- enable_interrupts(I32_bit);
+ restore_interrupts(psw);
}
void
