Date: Sun, 19 Oct 2008 01:33:58 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r184041 - head/sys/i386/i386 Message-ID: <200810190133.m9J1Xwq2030682@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810190133.m9J1Xwq2030682>