--- support.s.orig	Sat Nov 13 11:29:48 2004
+++ support.s	Fri Mar 18 14:00:56 2005
@@ -1327,7 +1327,9 @@
 	movl	8(%esp),%eax
 	movl	%eax,(%edx)
 	xorl	%eax,%eax
-	movl	PCPU(CURPCB),%ecx
+#ifdef I386_CPU
+	movl	PCPU(CURPCB),%ecx		/* restore trashed register */
+#endif
 	movl	%eax,PCB_ONFAULT(%ecx)
 	ret
 
@@ -1370,7 +1372,9 @@
 	movw	8(%esp),%ax
 	movw	%ax,(%edx)
 	xorl	%eax,%eax
+#ifdef I386_CPU
 	movl	PCPU(CURPCB),%ecx		/* restore trashed register */
+#endif
 	movl	%eax,PCB_ONFAULT(%ecx)
 	ret
 
@@ -1412,7 +1416,9 @@
 	movb	8(%esp),%al
 	movb	%al,(%edx)
 	xorl	%eax,%eax
+#ifdef I386_CPU
 	movl	PCPU(CURPCB),%ecx		/* restore trashed register */
+#endif
 	movl	%eax,PCB_ONFAULT(%ecx)
 	ret
 
@@ -1475,7 +1481,6 @@
 
 cpystrflt_x:
 	/* set *lencopied and return %eax */
-	movl	PCPU(CURPCB),%ecx
 	movl	$0,PCB_ONFAULT(%ecx)
 	movl	20(%esp),%ecx
 	subl	%edx,%ecx