Source-Changes-HG archive

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

[src/netbsd-8]: src/sys Pull up following revision(s) (requested by skrll in ...



details:   https://anonhg.NetBSD.org/src/rev/abcf5de2174b
branches:  netbsd-8
changeset: 434431:abcf5de2174b
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Nov 23 13:29:32 2017 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #385):
        sys/dev/usb/xhci.c: revision 1.77
        sys/external/bsd/dwc2/dwc2.c: revision 1.47
        sys/dev/usb/motg.c: revision 1.19
        sys/dev/usb/ehci.c: revision 1.257
        sys/dev/usb/ohci.c: revision 1.276
        sys/dev/usb/uhci.c: revision 1.279

s/PR_NOWAIT/PR_WAITOK/ in HCD allocx (allocate xfer) method

diffstat:

 sys/dev/usb/ehci.c           |  6 +++---
 sys/dev/usb/motg.c           |  6 +++---
 sys/dev/usb/ohci.c           |  6 +++---
 sys/dev/usb/uhci.c           |  6 +++---
 sys/dev/usb/xhci.c           |  6 +++---
 sys/external/bsd/dwc2/dwc2.c |  6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diffs (162 lines):

diff -r 8940e2d33079 -r abcf5de2174b sys/dev/usb/ehci.c
--- a/sys/dev/usb/ehci.c        Thu Nov 23 13:26:01 2017 +0000
+++ b/sys/dev/usb/ehci.c        Thu Nov 23 13:29:32 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehci.c,v 1.254.8.2 2017/11/02 21:29:52 snj Exp $ */
+/*     $NetBSD: ehci.c,v 1.254.8.3 2017/11/23 13:29:32 martin Exp $ */
 
 /*
  * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.254.8.2 2017/11/02 21:29:52 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.254.8.3 2017/11/23 13:29:32 martin Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
@@ -1516,7 +1516,7 @@
        struct ehci_softc *sc = EHCI_BUS2SC(bus);
        struct usbd_xfer *xfer;
 
-       xfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
+       xfer = pool_cache_get(sc->sc_xferpool, PR_WAITOK);
        if (xfer != NULL) {
                memset(xfer, 0, sizeof(struct ehci_xfer));
 #ifdef DIAGNOSTIC
diff -r 8940e2d33079 -r abcf5de2174b sys/dev/usb/motg.c
--- a/sys/dev/usb/motg.c        Thu Nov 23 13:26:01 2017 +0000
+++ b/sys/dev/usb/motg.c        Thu Nov 23 13:29:32 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: motg.c,v 1.17.10.1 2017/11/02 21:29:52 snj Exp $       */
+/*     $NetBSD: motg.c,v 1.17.10.2 2017/11/23 13:29:32 martin Exp $    */
 
 /*
  * Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.17.10.1 2017/11/02 21:29:52 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.17.10.2 2017/11/23 13:29:32 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_motg.h"
@@ -752,7 +752,7 @@
        struct motg_softc *sc = MOTG_BUS2SC(bus);
        struct usbd_xfer *xfer;
 
-       xfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
+       xfer = pool_cache_get(sc->sc_xferpool, PR_WAITOK);
        if (xfer != NULL) {
                memset(xfer, 0, sizeof(struct motg_xfer));
 #ifdef DIAGNOSTIC
diff -r 8940e2d33079 -r abcf5de2174b sys/dev/usb/ohci.c
--- a/sys/dev/usb/ohci.c        Thu Nov 23 13:26:01 2017 +0000
+++ b/sys/dev/usb/ohci.c        Thu Nov 23 13:29:32 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ohci.c,v 1.273.6.1 2017/11/02 21:29:52 snj Exp $       */
+/*     $NetBSD: ohci.c,v 1.273.6.2 2017/11/23 13:29:32 martin Exp $    */
 
 /*
  * Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.273.6.1 2017/11/02 21:29:52 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.273.6.2 2017/11/23 13:29:32 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1069,7 +1069,7 @@
        ohci_softc_t *sc = OHCI_BUS2SC(bus);
        struct usbd_xfer *xfer;
 
-       xfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
+       xfer = pool_cache_get(sc->sc_xferpool, PR_WAITOK);
        if (xfer != NULL) {
                memset(xfer, 0, sizeof(struct ohci_xfer));
 #ifdef DIAGNOSTIC
diff -r 8940e2d33079 -r abcf5de2174b sys/dev/usb/uhci.c
--- a/sys/dev/usb/uhci.c        Thu Nov 23 13:26:01 2017 +0000
+++ b/sys/dev/usb/uhci.c        Thu Nov 23 13:29:32 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uhci.c,v 1.275.2.2 2017/11/02 21:29:52 snj Exp $       */
+/*     $NetBSD: uhci.c,v 1.275.2.3 2017/11/23 13:29:32 martin Exp $    */
 
 /*
  * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.275.2.2 2017/11/02 21:29:52 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.275.2.3 2017/11/23 13:29:32 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -657,7 +657,7 @@
        struct uhci_softc *sc = UHCI_BUS2SC(bus);
        struct usbd_xfer *xfer;
 
-       xfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
+       xfer = pool_cache_get(sc->sc_xferpool, PR_WAITOK);
        if (xfer != NULL) {
                memset(xfer, 0, sizeof(struct uhci_xfer));
 
diff -r 8940e2d33079 -r abcf5de2174b sys/dev/usb/xhci.c
--- a/sys/dev/usb/xhci.c        Thu Nov 23 13:26:01 2017 +0000
+++ b/sys/dev/usb/xhci.c        Thu Nov 23 13:29:32 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xhci.c,v 1.72.2.3 2017/11/17 20:35:57 snj Exp $        */
+/*     $NetBSD: xhci.c,v 1.72.2.4 2017/11/23 13:29:32 martin Exp $     */
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.72.2.3 2017/11/17 20:35:57 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.72.2.4 2017/11/23 13:29:32 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -2182,7 +2182,7 @@
 
        XHCIHIST_FUNC(); XHCIHIST_CALLED();
 
-       xfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
+       xfer = pool_cache_get(sc->sc_xferpool, PR_WAITOK);
        if (xfer != NULL) {
                memset(xfer, 0, sizeof(struct xhci_xfer));
 #ifdef DIAGNOSTIC
diff -r 8940e2d33079 -r abcf5de2174b sys/external/bsd/dwc2/dwc2.c
--- a/sys/external/bsd/dwc2/dwc2.c      Thu Nov 23 13:26:01 2017 +0000
+++ b/sys/external/bsd/dwc2/dwc2.c      Thu Nov 23 13:29:32 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dwc2.c,v 1.46 2017/06/01 02:45:12 chs Exp $    */
+/*     $NetBSD: dwc2.c,v 1.46.2.1 2017/11/23 13:29:32 martin Exp $     */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.46 2017/06/01 02:45:12 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.46.2.1 2017/11/23 13:29:32 martin Exp $");
 
 #include "opt_usb.h"
 
@@ -207,7 +207,7 @@
        DPRINTFN(10, "\n");
 
        DWC2_EVCNT_INCR(sc->sc_ev_xferpoolget);
-       dxfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
+       dxfer = pool_cache_get(sc->sc_xferpool, PR_WAITOK);
        if (dxfer != NULL) {
                memset(dxfer, 0, sizeof(*dxfer));
 



Home | Main Index | Thread Index | Old Index