From owner-p4-projects@FreeBSD.ORG  Thu Mar 30 20:17:58 2006
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 8F9A916A422; Thu, 30 Mar 2006 20:17:58 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 52D5916A420
	for <perforce@freebsd.org>; Thu, 30 Mar 2006 20:17:58 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8395443D70
	for <perforce@freebsd.org>; Thu, 30 Mar 2006 20:17:54 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2UKHslH072088
	for <perforce@freebsd.org>; Thu, 30 Mar 2006 20:17:54 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2UKHrdN072085
	for perforce@freebsd.org; Thu, 30 Mar 2006 20:17:53 GMT
	(envelope-from jhb@freebsd.org)
Date: Thu, 30 Mar 2006 20:17:53 GMT
Message-Id: <200603302017.k2UKHrdN072085@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 94321 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: Thu, 30 Mar 2006 20:17:58 -0000

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

Change 94321 by jhb@jhb_blue on 2006/03/30 20:16:58

	Compile.

Affected files ...

.. //depot/projects/smpng/sys/i386/isa/npx.c#52 edit
.. //depot/projects/smpng/sys/kern/kern_linker.c#52 edit

Differences ...

==== //depot/projects/smpng/sys/i386/isa/npx.c#52 (text+ko) ====

@@ -250,7 +250,8 @@
 	u_short control;
 	u_short status;
 
-	KASSERT(rcr0() & (CRO_MP | CRO_NE) == (CR0_MP | CR0_NE), ("cr0 busted"));
+	KASSERT((rcr0() & (CR0_MP | CR0_NE)) == (CR0_MP | CR0_NE),
+	    ("cr0 busted"));
 	if (cpu_feature & CPUID_FPU) {
 		hw_float = npx_exists = 1;
 		npx_ex16 = 1;

==== //depot/projects/smpng/sys/kern/kern_linker.c#52 (text+ko) ====

@@ -1784,6 +1784,7 @@
 {
 	int error, locked;
 
+	locked = KLD_LOCKED();
 	if (!locked)
 		KLD_LOCK();
 	error = linker_load_module_internal(kldname, modname, parent,