Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/jdolecek-ncqfixes]: src/sys/dev/ata revert atabus_alloc_drives() to use ...



details:   https://anonhg.NetBSD.org/src/rev/4e7fae7cb16c
branches:  jdolecek-ncqfixes
changeset: 850581:4e7fae7cb16c
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sat Sep 22 12:20:31 2018 +0000

description:
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

diffstat:

 sys/dev/ata/ata.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r f3da49ca9718 -r 4e7fae7cb16c sys/dev/ata/ata.c
--- a/sys/dev/ata/ata.c Sat Sep 22 09:26:48 2018 +0000
+++ b/sys/dev/ata/ata.c Sat Sep 22 12:20:31 2018 +0000
@@ -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_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,



Home | Main Index | Thread Index | Old Index