Module Name: src
Committed By: jdolecek
Date: Sat Sep 22 12:20:32 UTC 2018
Modified Files:
src/sys/dev/ata [jdolecek-ncqfixes]: ata.c
Log Message:
revert atabus_alloc_drives() to use KM_NOSLEEP again - it's called with
ch_lock held hence cannot actually sleep, fixing is out of scope of the branch
To generate a diff of this commit:
cvs rdiff -u -r1.141.6.7 -r1.141.6.8 src/sys/dev/ata/ata.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/ata/ata.c
diff -u src/sys/dev/ata/ata.c:1.141.6.7 src/sys/dev/ata/ata.c:1.141.6.8
--- src/sys/dev/ata/ata.c:1.141.6.7 Sat Sep 22 09:26:48 2018
+++ src/sys/dev/ata/ata.c Sat Sep 22 12:20:31 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ata.c,v 1.141.6.7 2018/09/22 09:26:48 jdolecek Exp $ */
+/* $NetBSD: ata.c,v 1.141.6.8 2018/09/22 12:20:31 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.141.6.7 2018/09/22 09:26:48 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.141.6.8 2018/09/22 12:20:31 jdolecek Exp $");
#include "opt_ata.h"
@@ -719,7 +719,7 @@ atabus_alloc_drives(struct ata_channel *
atabus_free_drives(chp);
if (chp->ch_drive == NULL) {
chp->ch_drive = kmem_zalloc(
- sizeof(struct ata_drive_datas) * ndrives, KM_SLEEP);
+ sizeof(struct ata_drive_datas) * ndrives, KM_NOSLEEP);
}
if (chp->ch_drive == NULL) {
aprint_error_dev(chp->ch_atac->atac_dev,
