[src/netbsd-6-0]: src/sys/dev/pci Pull up following revision(s) (requested by...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9abeb031a446
branches:  netbsd-6-0
changeset: 774970:9abeb031a446
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Aug 07 09:35:22 2014 +0000

description:
Pull up following revision(s) (requested by ozaki-r in ticket #1102):
        sys/dev/pci/if_vioif.c: revision 1.5
Don't set SOFTINT_MPSAFE to vioif_rx_softint
vioif_rx_softint calls vioif_populate_rx_mbufs that is not MPSAFE.
vioif_populate_rx_mbufs is also called via vioif_ioctl and so can
be called by two LWPs simultaneously, resulting in kernel panic.
PR kern/49007

diffstat:

 sys/dev/pci/if_vioif.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 1b57374f73a5 -r 9abeb031a446 sys/dev/pci/if_vioif.c
--- a/sys/dev/pci/if_vioif.c    Thu Aug 07 08:54:44 2014 +0000
+++ b/sys/dev/pci/if_vioif.c    Thu Aug 07 09:35:22 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_vioif.c,v 1.2.14.1 2013/05/12 16:38:33 riz Exp $    */
+/*     $NetBSD: if_vioif.c,v 1.2.14.2 2014/08/07 09:35:22 msaitoh Exp $        */
 
 /*
  * Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.2.14.1 2013/05/12 16:38:33 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.2.14.2 2014/08/07 09:35:22 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -557,7 +557,7 @@
                }
        }
 
-       sc->sc_rx_softint = softint_establish(SOFTINT_NET|SOFTINT_MPSAFE,
+       sc->sc_rx_softint = softint_establish(SOFTINT_NET,
                                              vioif_rx_softint, sc);
        if (sc->sc_rx_softint == NULL) {
                aprint_error_dev(self, "cannot establish softint\n");