Index: kernel/generic/include/ddi/irq.h
===================================================================
--- kernel/generic/include/ddi/irq.h	(revision 9306cd7e0e7b284355e39923f665d3acad4b3bdf)
+++ kernel/generic/include/ddi/irq.h	(revision 3422fb6a2a8e483c3294e3bfbd50bd1dc755217c)
@@ -90,10 +90,4 @@
 	/** Counter. */
 	size_t counter;
-	
-	/**
-	 * Link between IRQs that are notifying the same answerbox. The list is
-	 * protected by the answerbox irq_lock.
-	 */
-	link_t link;
 } ipc_notif_cfg_t;
 
Index: kernel/generic/include/ipc/ipc.h
===================================================================
--- kernel/generic/include/ipc/ipc.h	(revision 9306cd7e0e7b284355e39923f665d3acad4b3bdf)
+++ kernel/generic/include/ipc/ipc.h	(revision 3422fb6a2a8e483c3294e3bfbd50bd1dc755217c)
@@ -92,6 +92,4 @@
 	/** Notifications from IRQ handlers. */
 	list_t irq_notifs;
-	/** IRQs with notifications to this answerbox. */
-	list_t irq_list;
 } answerbox_t;
 
Index: kernel/generic/src/ddi/irq.c
===================================================================
--- kernel/generic/src/ddi/irq.c	(revision 9306cd7e0e7b284355e39923f665d3acad4b3bdf)
+++ kernel/generic/src/ddi/irq.c	(revision 3422fb6a2a8e483c3294e3bfbd50bd1dc755217c)
@@ -110,5 +110,4 @@
 	link_initialize(&irq->link);
 	irq_spinlock_initialize(&irq->lock, "irq.lock");
-	link_initialize(&irq->notif_cfg.link);
 	irq->inr = -1;
 	
Index: kernel/generic/src/ipc/ipc.c
===================================================================
--- kernel/generic/src/ipc/ipc.c	(revision 9306cd7e0e7b284355e39923f665d3acad4b3bdf)
+++ kernel/generic/src/ipc/ipc.c	(revision 3422fb6a2a8e483c3294e3bfbd50bd1dc755217c)
@@ -147,5 +147,4 @@
 	list_initialize(&box->answers);
 	list_initialize(&box->irq_notifs);
-	list_initialize(&box->irq_list);
 	box->task = task;
 }
Index: kernel/generic/src/ipc/irq.c
===================================================================
--- kernel/generic/src/ipc/irq.c	(revision 9306cd7e0e7b284355e39923f665d3acad4b3bdf)
+++ kernel/generic/src/ipc/irq.c	(revision 3422fb6a2a8e483c3294e3bfbd50bd1dc755217c)
@@ -347,11 +347,8 @@
 	irq_spinlock_lock(&irq_uspace_hash_table_lock, true);
 	irq_spinlock_lock(&irq->lock, false);
-	irq_spinlock_lock(&box->irq_lock, false);
 	
 	cap->type = CAP_TYPE_IRQ;
 	hash_table_insert(&irq_uspace_hash_table, key, &irq->link);
-	list_append(&irq->notif_cfg.link, &box->irq_list);
-	
-	irq_spinlock_unlock(&box->irq_lock, false);
+	
 	irq_spinlock_unlock(&irq->lock, false);
 	irq_spinlock_unlock(&irq_uspace_hash_table_lock, true);
@@ -383,15 +380,10 @@
 	irq_spinlock_lock(&irq_uspace_hash_table_lock, true);
 	irq_spinlock_lock(&irq->lock, false);
-	irq_spinlock_lock(&box->irq_lock, false);
 	
 	assert(irq->notif_cfg.answerbox == box);
-	
-	/* Remove the IRQ from the answerbox's list. */
-	list_remove(&irq->notif_cfg.link);
 	
 	/* Remove the IRQ from the uspace IRQ hash table. */
 	hash_table_remove_item(&irq_uspace_hash_table, &irq->link);
 	
-	irq_spinlock_unlock(&box->irq_lock, false);
 	/* irq->lock unlocked by the hash table remove_callback */
 	irq_spinlock_unlock(&irq_uspace_hash_table_lock, true);