From: Michael Neumann <mneumann@ntecs.de>
Date: Wed, 13 Oct 2010 21:43:28 +0000 (+0200)
Subject: APIC vector: Compact redirect entry's mask bit setting and clearing
X-Git-Tag: v2.9.1~4^2~7
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/6dfe7381bee92417a3bbb164cda65377c24723e6

APIC vector: Compact redirect entry's mask bit setting and clearing

Apply commit bda48b436116a809edab410f3ac5ac38f6cb4754 for x86_64.
---

diff --git a/sys/platform/pc64/apic/apic_vector.s b/sys/platform/pc64/apic/apic_vector.s
index 2bd8d07e20..02aa98d5d8 100644
--- a/sys/platform/pc64/apic/apic_vector.s
+++ b/sys/platform/pc64/apic/apic_vector.s
@@ -65,9 +65,7 @@
 	movq	IOAPICADDR(irq_num), %rcx ;	/* ioapic addr */	\
 	movl	REDIRIDX(irq_num), %eax ;	/* get the index */	\
 	movl	%eax, (%rcx) ;			/* write the index */	\
-	movl	IOAPIC_WINDOW(%rcx), %eax ;	/* current value */	\
-	orl	$IOART_INTMASK, %eax ;		/* set the mask */	\
-	movl	%eax, IOAPIC_WINDOW(%rcx) ;	/* new value */		\
+	orl	$IOART_INTMASK,IOAPIC_WINDOW(%rcx) ;/* set the mask */	\
 7: ;						/* already masked */	\
 	APIC_IMASK_UNLOCK ;						\
 
@@ -95,9 +93,7 @@
 	movq	IOAPICADDR(irq_num),%rcx ;	/* ioapic addr */	\
 	movl	REDIRIDX(irq_num), %eax ;	/* get the index */	\
 	movl	%eax,(%rcx) ;			/* write the index */	\
-	movl	IOAPIC_WINDOW(%rcx),%eax ;	/* current value */	\
-	andl	$~IOART_INTMASK,%eax ;		/* clear the mask */	\
-	movl	%eax,IOAPIC_WINDOW(%rcx) ;	/* new value */		\
+	andl	$~IOART_INTMASK,IOAPIC_WINDOW(%rcx) ;/* clear the mask */ \
 7: ;									\
 	APIC_IMASK_UNLOCK ;						\
 8: ;									\