Module Name: src
Committed By: martin
Date: Sun Mar 9 10:33:23 UTC 2014
Modified Files:
src/sys/arch/arm/gemini: gemini_timer.c
Log Message:
Remove an unused variable and fix a copy&pasto (I think)
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 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.5 src/sys/arch/arm/gemini/gemini_timer.c:1.6
--- src/sys/arch/arm/gemini/gemini_timer.c:1.5 Fri Jul 1 19:32:28 2011
+++ src/sys/arch/arm/gemini/gemini_timer.c Sun Mar 9 10:33:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_timer.c,v 1.5 2011/07/01 19:32:28 dyoung Exp $ */
+/* $NetBSD: gemini_timer.c,v 1.6 2014/03/09 10:33:23 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.5 2011/07/01 19:32:28 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_timer.c,v 1.6 2014/03/09 10:33:23 martin Exp $");
#include "opt_gemini.h"
#include "opt_cpuoptions.h"
@@ -257,9 +257,7 @@ statintr(void *frame)
static void
timer_init(geminitmr_softc_t *sc, int schz, boolean_t autoload, boolean_t intr)
{
- int psw;
-
- psw = disable_interrupts(I32_bit);
+ disable_interrupts(I32_bit);
timer_factors(sc, schz, autoload);
_timer_stop(sc);
_timer_intr_dis(sc);
@@ -267,7 +265,7 @@ timer_init(geminitmr_softc_t *sc, int sc
if (intr)
_timer_intr_enb(sc);
_timer_start(sc);
- psw = disable_interrupts(I32_bit);
+ enable_interrupts(I32_bit);
}
void
