PERFORCE change 94321 for review

[John Baldwin]

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

Change 94321 by jhb at 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,