diff -Nuarp xen-unstable-0301/tools/libxc/xc_linux_build.c xen-unstable-0301-patch/tools/libxc/xc_linux_build.c
--- xen-unstable-0301/tools/libxc/xc_linux_build.c	2005-03-02 14:42:21.895299792 -0600
+++ xen-unstable-0301-patch/tools/libxc/xc_linux_build.c	2005-03-02 14:14:25.884092224 -0600
@@ -433,7 +433,10 @@ int xc_linux_build(int xc_handle,
         ctxt->trap_ctxt[i].vector = i;
         ctxt->trap_ctxt[i].cs     = FLAT_KERNEL_CS;
     }
+
+#if defined(__i386__)
     ctxt->fast_trap_idx = 0;
+#endif
 
     /* No LDT. */
     ctxt->ldt_ents = 0;
diff -Nuarp xen-unstable-0301/tools/libxc/xc_plan9_build.c xen-unstable-0301-patch/tools/libxc/xc_plan9_build.c
--- xen-unstable-0301/tools/libxc/xc_plan9_build.c	2005-03-02 14:42:21.895299792 -0600
+++ xen-unstable-0301-patch/tools/libxc/xc_plan9_build.c	2005-03-02 14:14:57.207330368 -0600
@@ -505,7 +505,10 @@ xc_plan9_build(int xc_handle,
 		ctxt->trap_ctxt[i].vector = i;
 		ctxt->trap_ctxt[i].cs = FLAT_KERNEL_CS;
 	}
+
+#if defined(__i386__)
 	ctxt->fast_trap_idx = 0;
+#endif
 
 	/* No LDT. */
 	ctxt->ldt_ents = 0;
diff -Nuarp xen-unstable-0301/tools/libxc/xc_vmx_build.c xen-unstable-0301-patch/tools/libxc/xc_vmx_build.c
--- xen-unstable-0301/tools/libxc/xc_vmx_build.c	2005-03-02 14:42:21.895299792 -0600
+++ xen-unstable-0301-patch/tools/libxc/xc_vmx_build.c	2005-03-02 14:15:23.539327296 -0600
@@ -576,7 +576,10 @@ int xc_vmx_build(int xc_handle,
         ctxt->trap_ctxt[i].vector = i;
         ctxt->trap_ctxt[i].cs     = FLAT_KERNEL_CS;
     }
+
+#if defined(__i386__)
     ctxt->fast_trap_idx = 0;
+#endif
 
     /* No LDT. */
     ctxt->ldt_ents = 0;