Module Name: src
Committed By: skrll
Date: Tue Jan 5 16:15:09 UTC 2021
Modified Files:
src/sys/dev/usb: usb_mem.c
Log Message:
Replace home grown #ifdef DIAGNOSTIC check with ASSERT_SLEEPABLE
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/usb/usb_mem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usb_mem.c
diff -u src/sys/dev/usb/usb_mem.c:1.78 src/sys/dev/usb/usb_mem.c:1.79
--- src/sys/dev/usb/usb_mem.c:1.78 Sat Jan 2 12:39:03 2021
+++ src/sys/dev/usb/usb_mem.c Tue Jan 5 16:15:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_mem.c,v 1.78 2021/01/02 12:39:03 jmcneill Exp $ */
+/* $NetBSD: usb_mem.c,v 1.79 2021/01/05 16:15:09 skrll Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.78 2021/01/02 12:39:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.79 2021/01/05 16:15:09 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -211,12 +211,8 @@ usb_block_allocmem(bus_dma_tag_t tag, si
void
usb_block_real_freemem(usb_dma_block_t *b)
{
-#ifdef DIAGNOSTIC
- if (cpu_softintr_p() || cpu_intr_p()) {
- printf("usb_block_real_freemem: in interrupt context\n");
- return;
- }
-#endif
+ ASSERT_SLEEPABLE();
+
bus_dmamap_unload(b->tag, b->map);
bus_dmamap_destroy(b->tag, b->map);
bus_dmamem_unmap(b->tag, b->kaddr, b->size);
