Date: Tue, 9 Jun 2009 13:33:03 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r193828 - head/sys/dev/nmdm Message-ID: <200906091333.n59DX3Iw072524@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906091333.n59DX3Iw072524>