From owner-svn-src-head@FreeBSD.ORG  Sat Oct 25 04:46:02 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E5056106566B;
	Sat, 25 Oct 2008 04:46:02 +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 D35388FC20;
	Sat, 25 Oct 2008 04:46:02 +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 m9P4k211021628;
	Sat, 25 Oct 2008 04:46:02 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9P4k2T9021627;
	Sat, 25 Oct 2008 04:46:02 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200810250446.m9P4k2T9021627@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 25 Oct 2008 04:46:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184248 - head/sys/i386/xen
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Oct 2008 04:46:03 -0000

Author: kmacy
Date: Sat Oct 25 04:46:02 2008
New Revision: 184248
URL: http://svn.freebsd.org/changeset/base/184248

Log:
  handle case where eflags represents actual flags value when
  restoring interrupts

Modified:
  head/sys/i386/xen/xen_machdep.c

Modified: head/sys/i386/xen/xen_machdep.c
==============================================================================
--- head/sys/i386/xen/xen_machdep.c	Sat Oct 25 04:44:22 2008	(r184247)
+++ head/sys/i386/xen/xen_machdep.c	Sat Oct 25 04:46:02 2008	(r184248)
@@ -345,6 +345,8 @@ xen_load_cr3(u_int val)
 void
 xen_restore_flags(u_int eflags)
 {
+	if (eflags > 1)
+		eflags = ((eflags & PSL_I) == 0);
 
 	__restore_flags(eflags);
 }