1 files changed, 5 insertions, 4 deletions

diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index 598d7b3d9355..efde1f16c603 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -21,6 +21,8 @@
 #include <irq_user.h>
 
 
+extern void free_irqs(void);
+
 /* When epoll triggers we do not know why it did so
  * we can also have different IRQs for read and write.
  * This is why we keep a small irq_fd array for each fd -
@@ -100,6 +102,8 @@ void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
                         }
                 }
         }
+
+        free_irqs();
 }
 
 static int assign_epoll_events_to_irq(struct irq_entry *irq_entry)
@@ -380,10 +384,8 @@ EXPORT_SYMBOL(deactivate_fd);
  */
 int deactivate_all_fds(void)
 {
-        unsigned long flags;
         struct irq_entry *to_free;
 
-        spin_lock_irqsave(&irq_lock, flags);
         /* Stop IO. The IRQ loop has no lock so this is our
          * only way of making sure we are safe to dispose
          * of all IRQ handlers
@@ -399,8 +401,7 @@ int deactivate_all_fds(void)
                 );
                 to_free = to_free->next;
         }
-        garbage_collect_irq_entries();
-        spin_unlock_irqrestore(&irq_lock, flags);
+        /* don't garbage collect - we can no longer call kfree() here */
         os_close_epoll_fd();
         return 0;
 }