From owner-p4-projects@FreeBSD.ORG  Wed Mar 21 19:33:16 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7BA0016A4DE; Wed, 21 Mar 2007 19:33:16 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5643616A4CC
	for <perforce@freebsd.org>; Wed, 21 Mar 2007 19:33:16 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 2E97C13C48C
	for <perforce@freebsd.org>; Wed, 21 Mar 2007 19:33:16 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2LJXGG4093634
	for <perforce@freebsd.org>; Wed, 21 Mar 2007 19:33:16 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2LJXFrK093630
	for perforce@freebsd.org; Wed, 21 Mar 2007 19:33:15 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 21 Mar 2007 19:33:15 GMT
Message-Id: <200703211933.l2LJXFrK093630@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 116278 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Mar 2007 19:33:16 -0000

http://perforce.freebsd.org/chv.cgi?CH=116278

Change 116278 by jhb@jhb_mutex on 2007/03/21 19:32:31

	Fix a mismerge.

Affected files ...

.. //depot/projects/smpng/sys/kern/subr_firmware.c#17 edit

Differences ...

==== //depot/projects/smpng/sys/kern/subr_firmware.c#17 (text+ko) ====

@@ -372,8 +372,6 @@
 		 */
 		if (err == 0)
 			fp->file = NULL; 
-		else if (fp->file)
-			taskqueue_enqueue(taskqueue_thread, &firmware_task);
 	}
 	mtx_unlock(&firmware_mtx);
 }