PERFORCE change 101294 for review

[John Baldwin]

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

Change 101294 by jhb at jhb_mutex on 2006/07/11 21:03:34

	Remove an attempted optimization that didn't help.

Affected files ...

.. //depot/projects/smpng/sys/i386/include/cpufunc.h#33 edit

Differences ...

==== //depot/projects/smpng/sys/i386/include/cpufunc.h#33 (text+ko) ====

@@ -42,8 +42,6 @@
 #error this file needs sys/cdefs.h as a prerequisite
 #endif
 
-#include <machine/psl.h>
-
 struct region_descriptor;
 
 #define readb(va)	(*(volatile u_int8_t *) (va))
@@ -622,16 +620,14 @@
 	register_t eflags;
 
 	eflags = read_eflags();
-	if (eflags & PSL_I)
-		disable_intr();
+	disable_intr();
 	return (eflags);
 }
 
 static __inline void
 intr_restore(register_t eflags)
 {
-	if (eflags & PSL_I)
-		enable_intr();
+	write_eflags(eflags);
 }
 
 #else /* !(__GNUCLIKE_ASM && __CC_SUPPORTS___INLINE) */