Changeset a2bd8822 in mainline for kernel/generic/src/ipc/irq.c

Timestamp:

2012-02-25T16:50:37Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6561a8e

Parents:

a76b01b4 (diff), b40ea02 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline fix

File:

• kernel/generic/src/ipc/irq.c (modified) (4 diffs)

kernel/generic/src/ipc/irq.c

@@ -358 +358 @@
         ASSERT(irq->notif_cfg.answerbox == box);
         
-        /* Free up the pseudo code and associated structures. */
-        code_free(irq->notif_cfg.code);
-        
         /* Remove the IRQ from the answerbox's list. */
         list_remove(&irq->notif_cfg.link);
@@ -378 +375 @@
         irq_spinlock_unlock(&box->irq_lock, false);
         irq_spinlock_unlock(&irq_uspace_hash_table_lock, true);
+        
+        /* Free up the pseudo code and associated structures. */
+        code_free(irq->notif_cfg.code);
         
         /* Free up the IRQ structure. */
@@ -425 +425 @@
                 list_remove(&irq->notif_cfg.link);
                 
-                /* Free up the pseudo code and associated structures. */
-                code_free(irq->notif_cfg.code);
-                
                 /*
                  * We need to drop the IRQ lock now because hash_table_remove()
@@ -439 +436 @@
                 /* Remove from the hash table. */
                 hash_table_remove(&irq_uspace_hash_table, key, 2);
-                
+
+                /*
+                 * Release both locks so that we can free the pseudo code.
+                 */
+                irq_spinlock_unlock(&box->irq_lock, false);
+                irq_spinlock_unlock(&irq_uspace_hash_table_lock, true);
+
+                code_free(irq->notif_cfg.code);
                 free(irq);
+                
+                /* Reacquire both locks before taking another round. */
+                irq_spinlock_lock(&irq_uspace_hash_table_lock, true);
+                irq_spinlock_lock(&box->irq_lock, false);
         }