Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src/sys Pull up following revision(s) (requested by skrll in ...
details: https://anonhg.NetBSD.org/src/rev/e0de18cfddc4
branches: netbsd-7
changeset: 800374:e0de18cfddc4
user: snj <snj%NetBSD.org@localhost>
date: Wed Jan 03 20:02:37 2018 +0000
description:
Pull up following revision(s) (requested by skrll in ticket #1529):
sys/dev/usb/ehci.c: revision 1.257
sys/dev/usb/motg.c: revision 1.19
sys/dev/usb/ohci.c: revision 1.276
sys/dev/usb/uhci.c: revision 1.279
sys/dev/usb/xhci.c: revision 1.77
sys/external/bsd/dwc2/dwc2.c: revision 1.47
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 806cf401ef11 -r e0de18cfddc4 sys/dev/usb/ehci.c
--- a/sys/dev/usb/ehci.c Wed Jan 03 20:00:23 2018 +0000
+++ b/sys/dev/usb/ehci.c Wed Jan 03 20:02:37 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.228.2.1 2017/04/05 19:54:19 snj Exp $ */
+/* $NetBSD: ehci.c,v 1.228.2.2 2018/01/03 20:02:37 snj 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.228.2.1 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.228.2.2 2018/01/03 20:02:37 snj Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -1508,7 +1508,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 806cf401ef11 -r e0de18cfddc4 sys/dev/usb/motg.c
--- a/sys/dev/usb/motg.c Wed Jan 03 20:00:23 2018 +0000
+++ b/sys/dev/usb/motg.c Wed Jan 03 20:02:37 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: motg.c,v 1.6.4.3 2017/04/05 19:54:19 snj Exp $ */
+/* $NetBSD: motg.c,v 1.6.4.4 2018/01/03 20:02:37 snj 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.6.4.3 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.6.4.4 2018/01/03 20:02:37 snj 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 806cf401ef11 -r e0de18cfddc4 sys/dev/usb/ohci.c
--- a/sys/dev/usb/ohci.c Wed Jan 03 20:00:23 2018 +0000
+++ b/sys/dev/usb/ohci.c Wed Jan 03 20:02:37 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.253.2.3 2017/04/05 19:54:19 snj Exp $ */
+/* $NetBSD: ohci.c,v 1.253.2.4 2018/01/03 20:02:37 snj 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.253.2.3 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.253.2.4 2018/01/03 20:02:37 snj Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1065,7 +1065,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 806cf401ef11 -r e0de18cfddc4 sys/dev/usb/uhci.c
--- a/sys/dev/usb/uhci.c Wed Jan 03 20:00:23 2018 +0000
+++ b/sys/dev/usb/uhci.c Wed Jan 03 20:02:37 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.264.2.2 2017/07/23 06:11:47 snj Exp $ */
+/* $NetBSD: uhci.c,v 1.264.2.3 2018/01/03 20:02:37 snj 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.264.2.2 2017/07/23 06:11:47 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.264.2.3 2018/01/03 20:02:37 snj 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 806cf401ef11 -r e0de18cfddc4 sys/dev/usb/xhci.c
--- a/sys/dev/usb/xhci.c Wed Jan 03 20:00:23 2018 +0000
+++ b/sys/dev/usb/xhci.c Wed Jan 03 20:02:37 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.23.2.6 2018/01/03 19:48:45 snj Exp $ */
+/* $NetBSD: xhci.c,v 1.23.2.7 2018/01/03 20:02:37 snj Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.23.2.6 2018/01/03 19:48:45 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.23.2.7 2018/01/03 20:02:37 snj Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2168,7 +2168,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 806cf401ef11 -r e0de18cfddc4 sys/external/bsd/dwc2/dwc2.c
--- a/sys/external/bsd/dwc2/dwc2.c Wed Jan 03 20:00:23 2018 +0000
+++ b/sys/external/bsd/dwc2/dwc2.c Wed Jan 03 20:02:37 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2.c,v 1.31.2.2 2017/04/05 19:54:22 snj Exp $ */
+/* $NetBSD: dwc2.c,v 1.31.2.3 2018/01/03 20:02:37 snj Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.31.2.2 2017/04/05 19:54:22 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.31.2.3 2018/01/03 20:02:37 snj 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