[src/jdolecek-ncq]: src/sys/dev/ata ata subsystem needs more work before wd(4...

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ce7393941e5d
branches:  jdolecek-ncq
changeset: 822929:ce7393941e5d
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Mon Jun 19 17:11:24 2017 +0000

description:
ata subsystem needs more work before wd(4) could be MPSAFE

diffstat:

 sys/dev/ata/wd.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 87c06e0aed91 -r ce7393941e5d sys/dev/ata/wd.c
--- a/sys/dev/ata/wd.c  Sat Jun 17 20:35:33 2017 +0000
+++ b/sys/dev/ata/wd.c  Mon Jun 19 17:11:24 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wd.c,v 1.428.2.16 2017/06/16 20:40:49 jdolecek Exp $ */
+/*     $NetBSD: wd.c,v 1.428.2.17 2017/06/19 17:11:24 jdolecek Exp $ */
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.428.2.16 2017/06/16 20:40:49 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.428.2.17 2017/06/19 17:11:24 jdolecek Exp $");
 
 #include "opt_ata.h"
 
@@ -150,7 +150,7 @@
        .d_dump = wddump,
        .d_psize = wdsize,
        .d_discard = wddiscard,
-       .d_flag = D_DISK | D_MPSAFE
+       .d_flag = D_DISK
 };
 
 const struct cdevsw wd_cdevsw = {
@@ -165,7 +165,7 @@
        .d_mmap = nommap,
        .d_kqfilter = nokqfilter,
        .d_discard = wddiscard,
-       .d_flag = D_DISK | D_MPSAFE
+       .d_flag = D_DISK
 };
 
 /* #define WD_DUMP_NOT_TRUSTED if you just want to watch */
@@ -298,7 +298,7 @@
        wd->sc_dev = self;
 
        ATADEBUG_PRINT(("wdattach\n"), DEBUG_FUNCS | DEBUG_PROBE);
-       callout_init(&wd->sc_restart_ch, CALLOUT_MPSAFE);
+       callout_init(&wd->sc_restart_ch, 0);
        callout_setfunc(&wd->sc_restart_ch, wdrestart, wd);
        mutex_init(&wd->sc_lock, MUTEX_DEFAULT, IPL_BIO);
        bufq_alloc(&wd->sc_q, BUFQ_DISK_DEFAULT_STRAT, BUFQ_SORT_RAWBLOCK);