Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/sparc64/dev allow sparc64 spc_find_ino() to be NULL...



details:   https://anonhg.NetBSD.org/src/rev/064a566b905c
branches:  trunk
changeset: 759857:064a566b905c
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Dec 18 05:14:13 2010 +0000

description:
allow sparc64 spc_find_ino() to be NULL; schizo doesn't need it.

diffstat:

 sys/arch/sparc64/dev/pci_machdep.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 05361c7c6748 -r 064a566b905c sys/arch/sparc64/dev/pci_machdep.c
--- a/sys/arch/sparc64/dev/pci_machdep.c        Sat Dec 18 04:31:41 2010 +0000
+++ b/sys/arch/sparc64/dev/pci_machdep.c        Sat Dec 18 05:14:13 2010 +0000
@@ -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));
 



Home | Main Index | Thread Index | Old Index