From owner-svn-src-all@FreeBSD.ORG  Sun Oct 19 01:33:58 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CAE771065686;
	Sun, 19 Oct 2008 01:33:58 +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 B9C538FC22;
	Sun, 19 Oct 2008 01:33:58 +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 m9J1XwbA030683;
	Sun, 19 Oct 2008 01:33:58 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9J1Xwq2030682;
	Sun, 19 Oct 2008 01:33:58 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200810190133.m9J1Xwq2030682@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sun, 19 Oct 2008 01:33:58 +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: r184041 - head/sys/i386/i386
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Oct 2008 01:33:58 -0000

Author: kmacy
Date: Sun Oct 19 01:33:58 2008
New Revision: 184041
URL: http://svn.freebsd.org/changeset/base/184041

Log:
  GC gratuitous XEN defines

Modified:
  head/sys/i386/i386/trap.c

Modified: head/sys/i386/i386/trap.c
==============================================================================
--- head/sys/i386/i386/trap.c	Sun Oct 19 01:27:40 2008	(r184040)
+++ head/sys/i386/i386/trap.c	Sun Oct 19 01:33:58 2008	(r184041)
@@ -159,11 +159,7 @@ static char *trap_msg[] = {
 	"alignment fault",			/* 14 T_ALIGNFLT */
 	"",					/* 15 unused */
 	"",					/* 16 unused */
-#ifdef XEN
-	"hypervisor callback",			/* 17 T_HYPCALLBACK*/
-#else	
 	"",					/* 17 unused */
-#endif
 	"integer divide fault",			/* 18 T_DIVIDE */
 	"non-maskable interrupt trap",		/* 19 T_NMI */
 	"overflow trap",			/* 20 T_OFLOW */
@@ -270,7 +266,6 @@ trap(struct trapframe *frame)
 			goto out;
 #endif
 
-#ifndef XEN
 	if ((frame->tf_eflags & PSL_I) == 0) {
 		/*
 		 * Buggy application or kernel code has disabled
@@ -301,7 +296,6 @@ trap(struct trapframe *frame)
 				enable_intr();
 		}
 	}
-#endif /* !XEN */  
 	eva = 0;
 	code = frame->tf_err;
 	if (type == T_PAGEFLT) {