Module Name:	src
Committed By:	yamt
Date:		Wed Nov 28 14:02:31 UTC 2007

Modified Files:
	src/sys/arch/i386/i386: trap.c
	src/sys/arch/xen/conf: files.xen
Removed Files:
	src/sys/arch/xen/i386: trap.c

Log Message:
- merge {i386,xen}/i386/trap.c.
- add a comment about a hack for xen2.


To generate a diff of this commit:
cvs rdiff -r1.224 -r1.225 src/sys/arch/i386/i386/trap.c
cvs rdiff -r1.71 -r1.72 src/sys/arch/xen/conf/files.xen
cvs rdiff -r1.21 -r0 src/sys/arch/xen/i386/trap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.