Module Name: src
Committed By: rmind
Date: Thu Aug 26 20:09:33 UTC 2010
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_intr.c rmixl_pcie.c
rmixl_pcix.c
Log Message:
Fix non-DEBUG/DIAGNOSTIC builds of RMI mips64.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.22 -r1.1.2.23 src/sys/arch/mips/rmi/rmixl_intr.c
cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/sys/arch/mips/rmi/rmixl_pcie.c
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/arch/mips/rmi/rmixl_pcix.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/rmi/rmixl_intr.c
diff -u src/sys/arch/mips/rmi/rmixl_intr.c:1.1.2.22 src/sys/arch/mips/rmi/rmixl_intr.c:1.1.2.23
--- src/sys/arch/mips/rmi/rmixl_intr.c:1.1.2.22 Thu Jun 10 00:41:43 2010
+++ src/sys/arch/mips/rmi/rmixl_intr.c Thu Aug 26 20:09:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_intr.c,v 1.1.2.22 2010/06/10 00:41:43 cliff Exp $ */
+/* $NetBSD: rmixl_intr.c,v 1.1.2.23 2010/08/26 20:09:33 rmind Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_intr.c,v 1.1.2.22 2010/06/10 00:41:43 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_intr.c,v 1.1.2.23 2010/08/26 20:09:33 rmind Exp $");
#include "opt_ddb.h"
#define __INTR_PRIVATE
@@ -373,7 +373,7 @@
static int rmixl_ipi_intr(void *);
#endif
-#if defined(IOINTR_DEBUG) || defined(DIAGNOSTIC)
+#if defined(DIAGNOSTIC) || defined(IOINTR_DEBUG) || defined(DDB)
int rmixl_intrhand_print_subr(int);
int rmixl_intrhand_print(void);
int rmixl_irt_print(void);
Index: src/sys/arch/mips/rmi/rmixl_pcie.c
diff -u src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.14 src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.15
--- src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.14 Sat May 8 18:08:34 2010
+++ src/sys/arch/mips/rmi/rmixl_pcie.c Thu Aug 26 20:09:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcie.c,v 1.1.2.14 2010/05/08 18:08:34 matt Exp $ */
+/* $NetBSD: rmixl_pcie.c,v 1.1.2.15 2010/08/26 20:09:33 rmind Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie.c,v 1.1.2.14 2010/05/08 18:08:34 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie.c,v 1.1.2.15 2010/08/26 20:09:33 rmind Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -1222,7 +1222,7 @@
u_int link, bitno, irq;
uint32_t r;
rmixl_pcie_link_intr_t *lip;
- rmixl_pcie_link_dispatch_t *dip;
+ rmixl_pcie_link_dispatch_t *dip = NULL;
uint32_t bit;
u_int offset;
int s;
Index: src/sys/arch/mips/rmi/rmixl_pcix.c
diff -u src/sys/arch/mips/rmi/rmixl_pcix.c:1.1.2.5 src/sys/arch/mips/rmi/rmixl_pcix.c:1.1.2.6
--- src/sys/arch/mips/rmi/rmixl_pcix.c:1.1.2.5 Sat Apr 17 07:34:08 2010
+++ src/sys/arch/mips/rmi/rmixl_pcix.c Thu Aug 26 20:09:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcix.c,v 1.1.2.5 2010/04/17 07:34:08 cliff Exp $ */
+/* $NetBSD: rmixl_pcix.c,v 1.1.2.6 2010/08/26 20:09:33 rmind Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcix.c,v 1.1.2.5 2010/04/17 07:34:08 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcix.c,v 1.1.2.6 2010/08/26 20:09:33 rmind Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -263,7 +263,7 @@
static int rmixl_pcix_found;
-#if defined(DIAGNOSTIC) || defined(DEBUG) || defined(DDB)
+#ifdef DIAGNOSTIC
static rmixl_pcix_softc_t *rmixl_pcix_sc;
#endif
