From 56b4a54e8eda7c55e5463feb51150358a9b87686 Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@gnupg.org>
Date: Fri, 15 Apr 2016 11:46:58 +0200
Subject: [PATCH gnumach 2/2] Port Samuels fix

---
 device/intr.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/device/intr.c b/device/intr.c
index 85915cd..11f0772 100644
--- a/device/intr.c
+++ b/device/intr.c
@@ -314,6 +314,10 @@ intr_thread ()
             assert (e->interrupts == 1);
             e->interrupts--;
 
+            /* The thread might go to sleep while delivering the
+               interrupt, hence we clear our event.  */
+            clear_wait (current_thread (), 0, 0);
+
             cpu_intr_restore (flags);
             deliver_intr (line, notification_port, interrupt_port);
             cpu_intr_save (&flags);
-- 
2.1.4