From owner-svn-src-projects@FreeBSD.ORG  Sat Oct 25 04:44:22 2008
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 79E3B1065671;
	Sat, 25 Oct 2008 04:44:22 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 68BE38FC0C;
	Sat, 25 Oct 2008 04:44:22 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9P4iMvQ021463;
	Sat, 25 Oct 2008 04:44:22 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9P4iMGC021462;
	Sat, 25 Oct 2008 04:44:22 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200810250444.m9P4iMGC021462@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 25 Oct 2008 04:44:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184247 - projects/releng_6_xen/sys/i386/xen
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Oct 2008 04:44:22 -0000

Author: kmacy
Date: Sat Oct 25 04:44:22 2008
New Revision: 184247
URL: http://svn.freebsd.org/changeset/base/184247

Log:
  handle case where actual eflags is passed to restore

Modified:
  projects/releng_6_xen/sys/i386/xen/xen_machdep.c

Modified: projects/releng_6_xen/sys/i386/xen/xen_machdep.c
==============================================================================
--- projects/releng_6_xen/sys/i386/xen/xen_machdep.c	Sat Oct 25 04:40:22 2008	(r184246)
+++ projects/releng_6_xen/sys/i386/xen/xen_machdep.c	Sat Oct 25 04:44:22 2008	(r184247)
@@ -349,6 +349,9 @@ void
 xen_restore_flags(u_int eflags)
 {
 
+	if (eflags > 1)
+		eflags = ((eflags & PSL_I) == 0);
+
 	__restore_flags(eflags);
 }