Module Name: src
Committed By: mrg
Date: Sat Dec 18 05:14:13 UTC 2010
Modified Files:
src/sys/arch/sparc64/dev: pci_machdep.c
Log Message:
allow sparc64 spc_find_ino() to be NULL; schizo doesn't need it.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/sparc64/dev/pci_machdep.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/sparc64/dev/pci_machdep.c
diff -u src/sys/arch/sparc64/dev/pci_machdep.c:1.67 src/sys/arch/sparc64/dev/pci_machdep.c:1.68
--- src/sys/arch/sparc64/dev/pci_machdep.c:1.67 Thu Jan 7 09:33:44 2010
+++ src/sys/arch/sparc64/dev/pci_machdep.c Sat Dec 18 05:14:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.67 2010/01/07 09:33:44 jdc Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.68 2010/12/18 05:14:13 mrg Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.67 2010/01/07 09:33:44 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.68 2010/12/18 05:14:13 mrg Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -438,8 +438,8 @@
if (OF_mapintr(node, &int_used, sizeof(int_used),
sizeof(int_used)) < 0) {
printf("OF_mapintr failed\n");
- KASSERT(pa->pa_pc->spc_find_ino);
- pa->pa_pc->spc_find_ino(pa, &int_used);
+ if (pa->pa_pc->spc_find_ino)
+ pa->pa_pc->spc_find_ino(pa, &int_used);
}
DPRINTF(SPDB_INTMAP, ("OF_mapintr() gave %x\n", int_used));
