From owner-p4-projects@FreeBSD.ORG  Tue Jul 11 21:05:35 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 7111C16A583; Tue, 11 Jul 2006 21:05:35 +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 3449D16A50E
	for <perforce@freebsd.org>; Tue, 11 Jul 2006 21:05:35 +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 41C9C43E04
	for <perforce@freebsd.org>; Tue, 11 Jul 2006 21:04:17 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6BL4HJO004236
	for <perforce@freebsd.org>; Tue, 11 Jul 2006 21:04:17 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6BL4GKX004229
	for perforce@freebsd.org; Tue, 11 Jul 2006 21:04:16 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 11 Jul 2006 21:04:16 GMT
Message-Id: <200607112104.k6BL4GKX004229@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 101294 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: Tue, 11 Jul 2006 21:05:35 -0000

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

Change 101294 by jhb@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) */