Module Name: src
Committed By: isaki
Date: Thu Dec 26 11:24:55 UTC 2019
Modified Files:
src/sys/dev/audio: audio.c
Log Message:
Use M_WAITOK instead of M_NOWAIT.
These allocations don't require NOWAIT constraints.
Will fix PR kern/54796.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/audio/audio.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/audio/audio.c
diff -u src/sys/dev/audio/audio.c:1.33 src/sys/dev/audio/audio.c:1.34
--- src/sys/dev/audio/audio.c:1.33 Wed Nov 6 13:37:27 2019
+++ src/sys/dev/audio/audio.c Thu Dec 26 11:24:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.33 2019/11/06 13:37:27 isaki Exp $ */
+/* $NetBSD: audio.c,v 1.34 2019/12/26 11:24:55 isaki Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -142,7 +142,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.33 2019/11/06 13:37:27 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.34 2019/12/26 11:24:55 isaki Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -3070,14 +3070,14 @@ audio_realloc(void *memblock, size_t byt
if (memblock != NULL) {
if (bytes != 0) {
- return kern_realloc(memblock, bytes, M_NOWAIT);
+ return kern_realloc(memblock, bytes, M_WAITOK);
} else {
kern_free(memblock);
return NULL;
}
} else {
if (bytes != 0) {
- return kern_malloc(bytes, M_NOWAIT);
+ return kern_malloc(bytes, M_WAITOK);
} else {
return NULL;
}
