4 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/i386/i386/apicvec.s b/sys/arch/i386/i386/apicvec.s
index 6d191a9c193..07ac34192ff 100644
--- a/sys/arch/i386/i386/apicvec.s
+++ b/sys/arch/i386/i386/apicvec.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: apicvec.s,v 1.27 2013/05/12 14:15:31 ratchov Exp $ */
+/* $OpenBSD: apicvec.s,v 1.28 2013/11/28 19:30:46 brad Exp $ */
 /* $NetBSD: apicvec.s,v 1.1.2.2 2000/02/21 21:54:01 sommerfeld Exp $ */
 
 /*-
@@ -290,7 +290,7 @@ _C_LABEL(Xintr_##name##num):						\
 	jz	4f							;\
 	addl	$1,IH_COUNT(%ebx)	/* count the intrs */		;\
 	adcl	$0,IH_COUNT+4(%ebx)					;\
-	cmp	$0,_C_LABEL(intr_shared_edge)				;\
+	cmpl	$0,_C_LABEL(intr_shared_edge)				;\
 	jne	4f			/* if no shared edges ... */	;\
 	orl	%eax,%eax		/* ... 1 means stop trying */	;\
 	js	4f							;\
diff --git a/sys/arch/i386/i386/apmcall.S b/sys/arch/i386/i386/apmcall.S
index 463b782074b..9e8a2077b03 100644
--- a/sys/arch/i386/i386/apmcall.S
+++ b/sys/arch/i386/i386/apmcall.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apmcall.S,v 1.5 2003/06/03 20:10:31 mickey Exp $	*/
+/*	$OpenBSD: apmcall.S,v 1.6 2013/11/28 19:30:46 brad Exp $	*/
 
 /*
  * Copyright (c) 2000,2001 Michael Shalayeff
@@ -56,7 +56,7 @@ ENTRY(apmcall)
 
 	pushfl
 
-	cmp	$0, _C_LABEL(apm_cli)
+	cmpl	$0, _C_LABEL(apm_cli)
 	je	1f
 	cli
 1:
@@ -74,7 +74,7 @@ ENTRY(apmcall)
 	movl	8(%ebp), %eax
 
 	clc
-	lcall	%cs:*(_C_LABEL(apm_ep))
+	lcall	*%cs:(_C_LABEL(apm_ep))
 	pushl	%eax
 	setc	%al
 	movzbl	%al, %esi
diff --git a/sys/arch/i386/i386/vector.s b/sys/arch/i386/i386/vector.s
index 926570a4be8..f865b217fa0 100644
--- a/sys/arch/i386/i386/vector.s
+++ b/sys/arch/i386/i386/vector.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vector.s,v 1.17 2013/05/12 14:15:31 ratchov Exp $	*/
+/*	$OpenBSD: vector.s,v 1.18 2013/11/28 19:30:46 brad Exp $	*/
 /*	$NetBSD: vector.s,v 1.32 1996/01/07 21:29:47 mycroft Exp $	*/
 
 /*
@@ -124,7 +124,7 @@ _C_LABEL(Xintr_##name##num):						;\
 	jz	5f			/* no, skip it */		;\
 	addl	$1,IH_COUNT(%ebx)	/* count the intrs */		;\
 	adcl	$0,IH_COUNT+4(%ebx)					;\
-	cmp	$0,_C_LABEL(intr_shared_edge)				;\
+	cmpl	$0,_C_LABEL(intr_shared_edge)				;\
 	jne	5f			 /* if no shared edges ... */	;\
 	orl	%eax,%eax		/* ... 1 means stop trying */	;\
 	jns	8f							;\
diff --git a/sys/arch/i386/pci/pcibios.c b/sys/arch/i386/pci/pcibios.c
index 47b5003ef27..0e9cdd13987 100644
--- a/sys/arch/i386/pci/pcibios.c
+++ b/sys/arch/i386/pci/pcibios.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcibios.c,v 1.42 2013/10/01 20:22:12 sf Exp $	*/
+/*	$OpenBSD: pcibios.c,v 1.43 2013/11/28 19:30:46 brad Exp $	*/
 /*	$NetBSD: pcibios.c,v 1.5 2000/08/01 05:23:59 uch Exp $	*/
 
 /*
@@ -346,7 +346,7 @@ pcibios_get_status(struct pcibios_softc *sc, u_int32_t *rev_maj,
 			 "pushl	%%ds\n\t"
 			 "movw	4(%%edi), %%cx\n\t"
 			 "movl	%%ecx, %%ds\n\t"
-			 "lcall	%%cs:*(%%edi)\n\t"
+			 "lcall	*%%cs:(%%edi)\n\t"
 			 "pop	%%ds\n\t"
 			 "pop	%%es\n\t"
 			 "jc	1f\n\t"
@@ -399,7 +399,7 @@ pcibios_get_intr_routing(struct pcibios_softc *sc,
 			 "pushl	%%ds\n\t"
 			 "movw	4(%%esi), %%cx\n\t"
 			 "movl	%%ecx, %%ds\n\t"
-			 "lcall	%%cs:*(%%esi)\n\t"
+			 "lcall	*%%cs:(%%esi)\n\t"
 			 "popl	%%ds\n\t"
 			 "popl	%%es\n\t"
 			 "jc	1f\n\t"