author: Johannes Berg <johannes.berg@intel.com> 2021-03-05 13:19:57 +0100
committer: Richard Weinberger <richard@nod.at> 2021-06-17 21:44:52 +0200
commit: a5ab7c8467f1934236e33d5fa1c3c6de831a6648
parent: d6b399a0e02a9063a5812af6cb8b657a4a1ecf68
Commit Summary:
Diffstat:
1 file changed, 6 insertions, 4 deletions
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index 1c448ea4729e..f3f19da7b876 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -101,10 +101,12 @@ static bool irq_do_timetravel_handler(struct irq_entry *entry,
if (!reg->timetravel_handler)
return false;
- /* prevent nesting - we'll get it again later when we SIGIO ourselves */
- if (reg->pending_on_resume)
- return true;
-
+ /*
+ * Handle all messages - we might get multiple even while
+ * interrupts are already suspended, due to suspend order
+ * etc. Note that time_travel_add_irq_event() will not add
+ * an event twice, if it's pending already "first wins".
+ */
reg->timetravel_handler(reg->irq, entry->fd, reg->id, ®->event);
if (!reg->event.pending)