Module Name: src
Committed By: jakllsch
Date: Sun Jul 22 16:54:35 UTC 2012
Modified Files:
src/sys/arch/arm/marvell: mvsoctmr.c
Log Message:
Remove duplicate global variable.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/marvell/mvsoctmr.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/marvell/mvsoctmr.c
diff -u src/sys/arch/arm/marvell/mvsoctmr.c:1.5 src/sys/arch/arm/marvell/mvsoctmr.c:1.6
--- src/sys/arch/arm/marvell/mvsoctmr.c:1.5 Sun Jul 22 16:52:51 2012
+++ src/sys/arch/arm/marvell/mvsoctmr.c Sun Jul 22 16:54:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsoctmr.c,v 1.5 2012/07/22 16:52:51 jakllsch Exp $ */
+/* $NetBSD: mvsoctmr.c,v 1.6 2012/07/22 16:54:35 jakllsch Exp $ */
/*
* Copyright (c) 2007, 2008 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsoctmr.c,v 1.5 2012/07/22 16:52:51 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsoctmr.c,v 1.6 2012/07/22 16:54:35 jakllsch Exp $");
#include "opt_ddb.h"
@@ -83,7 +83,6 @@ static int mvsoctmr_wdog_tickle(struct s
static int mvsoctmr_wdog_setmode(struct sysmon_wdog *);
#ifdef DDB
-static struct mvsoctmr_softc *mvsoctmr_softc;
static void mvsoctmr_wdog_ddb_trap(int);
#endif
@@ -152,7 +151,6 @@ mvsoctmr_attach(device_t parent, device_
rstoutn | MVSOC_MLMB_RSTOUTNMASKR_WDRSTOUTEN);
#ifdef DDB
- mvsoctmr_softc = sc;
db_trap_callback = mvsoctmr_wdog_ddb_trap;
#endif
@@ -342,7 +340,7 @@ mvsoctmr_wdog_tickle(struct sysmon_wdog
static void
mvsoctmr_wdog_ddb_trap(int enter)
{
- struct mvsoctmr_softc *sc = mvsoctmr_softc;
+ struct mvsoctmr_softc *sc = mvsoctmr_sc;
if (sc == NULL)
return;
