From owner-svn-src-all@FreeBSD.ORG Tue Jun 9 13:33:03 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA3B71065675; Tue, 9 Jun 2009 13:33:03 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C84AE8FC08; Tue, 9 Jun 2009 13:33:03 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n59DX3fr072525; Tue, 9 Jun 2009 13:33:03 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59DX3Iw072524; Tue, 9 Jun 2009 13:33:03 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200906091333.n59DX3Iw072524@svn.freebsd.org> From: John Baldwin Date: Tue, 9 Jun 2009 13:33:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193828 - head/sys/dev/nmdm X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jun 2009 13:33:04 -0000 Author: jhb Date: Tue Jun 9 13:33:03 2009 New Revision: 193828 URL: http://svn.freebsd.org/changeset/base/193828 Log: - Remove an unnecessary memory barrier from an atomic op. - Use the per-softc mutex to protect the softc data in the callout routine rather than letting it run without any locks whatsoever. Modified: head/sys/dev/nmdm/nmdm.c Modified: head/sys/dev/nmdm/nmdm.c ============================================================================== --- head/sys/dev/nmdm/nmdm.c Tue Jun 9 12:39:17 2009 (r193827) +++ head/sys/dev/nmdm/nmdm.c Tue Jun 9 13:33:03 2009 (r193828) @@ -100,7 +100,7 @@ nmdm_alloc(unsigned long unit) struct nmdmsoftc *ns; struct tty *tp; - atomic_add_acq_int(&nmdm_count, 1); + atomic_add_int(&nmdm_count, 1); ns = malloc(sizeof(*ns), M_NMDM, M_WAITOK|M_ZERO); mtx_init(&ns->ns_mtx, "nmdm", NULL, MTX_DEF); @@ -109,12 +109,12 @@ nmdm_alloc(unsigned long unit) ns->ns_part1.np_pair = ns; ns->ns_part1.np_other = &ns->ns_part2; TASK_INIT(&ns->ns_part1.np_task, 0, nmdm_task_tty, &ns->ns_part1); - callout_init(&ns->ns_part1.np_callout, CALLOUT_MPSAFE); + callout_init_mtx(&ns->ns_part1.np_callout, &ns->ns_mtx, 0); ns->ns_part2.np_pair = ns; ns->ns_part2.np_other = &ns->ns_part1; TASK_INIT(&ns->ns_part2.np_task, 0, nmdm_task_tty, &ns->ns_part2); - callout_init(&ns->ns_part2.np_callout, CALLOUT_MPSAFE); + callout_init_mtx(&ns->ns_part2.np_callout, &ns->ns_mtx, 0); /* Create device nodes. */ tp = ns->ns_part1.np_tty = tty_alloc_mutex(&nmdm_class, &ns->ns_part1,