>From 1dc2aedc175fdc5297eab566820ff26e664e4eca Mon Sep 17 00:00:00 2001
From: Damien Zammit <damien@zamaudio.com>
Date: Mon, 11 Nov 2019 21:04:47 +1100
Subject: [PATCH] Fix unmasking curr_pic_mask only irqs

---
 i386/i386at/interrupt.S | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i386/i386at/interrupt.S b/i386/i386at/interrupt.S
index 9f159c5c..3afebc86 100644
--- a/i386/i386at/interrupt.S
+++ b/i386/i386at/interrupt.S
@@ -51,8 +51,9 @@ ENTRY(interrupt)
 	jl	1f			/* no, skip it */
 	outb	%al,$(PIC_SLAVE_ICW)
 1:
-	movb	$0,%al			/* empty mask */
+	movl	EXT(curr_pic_mask),%eax	/* PIC mask to restore */
 	outb	%al,$(PIC_MASTER_OCW)	/* unmask master */
+	movb	%ah,%al			/* shuffle byte */
 	outb	%al,$(PIC_SLAVE_OCW)	/* unmask slave */
 	ret				/* return */
 END(interrupt)
-- 
2.23.0