diff options
| author | jake <jake@FreeBSD.org> | 2001-01-21 19:25:07 +0000 |
|---|---|---|
| committer | jake <jake@FreeBSD.org> | 2001-01-21 19:25:07 +0000 |
| commit | 937122ae6dc02a639d13dd06132201548bd7364f (patch) | |
| tree | 75b59a2832d9f622680ddf91bb405ee9b1f761d4 /sys/dev/usb/uhci.c | |
| parent | d326c51b74ea24afabc190774a1b7721c3e6d1e8 (diff) | |
| download | FreeBSD-src-937122ae6dc02a639d13dd06132201548bd7364f.zip FreeBSD-src-937122ae6dc02a639d13dd06132201548bd7364f.tar.gz | |
Make intr_nesting_level per-process, rather than per-cpu. Setup
interrupt threads to run with it always >= 1, so that malloc can
detect M_WAITOK from "interrupt" context. This is also necessary
in order to context switch from sched_ithd() directly.
Reviewed By: peter
Diffstat (limited to 'sys/dev/usb/uhci.c')
| -rw-r--r-- | sys/dev/usb/uhci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index 7098db1..1628268 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1610,7 +1610,7 @@ uhci_abort_xfer(usbd_xfer_handle xfer, usbd_status status) timeout(uhci_abort_xfer_end, xfer, hz / USB_FRAMES_PER_SECOND); } else { #if defined(DIAGNOSTIC) && defined(__i386__) && defined(__FreeBSD__) - KASSERT(PCPU_GET(intr_nesting_level) == 0, + KASSERT(curproc->p_intr_nesting_level == 0, ("ohci_abort_req in interrupt context")); #endif usb_delay_ms(xfer->pipe->device->bus, 1); |
