From owner-svn-src-head@FreeBSD.ORG  Wed Nov 19 21:07:34 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BF4581065673;
	Wed, 19 Nov 2008 21:07:34 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AF76B8FC26;
	Wed, 19 Nov 2008 21:07:34 +0000 (UTC) (envelope-from ed@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 mAJL7YPQ028503;
	Wed, 19 Nov 2008 21:07:34 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAJL7Ymt028502;
	Wed, 19 Nov 2008 21:07:34 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200811192107.mAJL7Ymt028502@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Wed, 19 Nov 2008 21:07:34 +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: r185106 - head/sys/dev/nmdm
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Nov 2008 21:07:34 -0000

Author: ed
Date: Wed Nov 19 21:07:33 2008
New Revision: 185106
URL: http://svn.freebsd.org/changeset/base/185106

Log:
  Make nmdm(4) use MPSAFE callouts.
  
  For some reason the nmdm(4) driver doesn't use CALLOUT_MPSAFE, even
  though we live in the MPSAFE TTY era. Add the CALLOUT_MPSAFE flags.
  System survives.

Modified:
  head/sys/dev/nmdm/nmdm.c

Modified: head/sys/dev/nmdm/nmdm.c
==============================================================================
--- head/sys/dev/nmdm/nmdm.c	Wed Nov 19 20:38:10 2008	(r185105)
+++ head/sys/dev/nmdm/nmdm.c	Wed Nov 19 21:07:33 2008	(r185106)
@@ -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, 0);
+	callout_init(&ns->ns_part1.np_callout, CALLOUT_MPSAFE);
 
 	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, 0);
+	callout_init(&ns->ns_part2.np_callout, CALLOUT_MPSAFE);
 
 	/* Create device nodes. */
 	tp = ns->ns_part1.np_tty = tty_alloc(&nmdm_class, &ns->ns_part1,