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

Timestamp:

2011-06-18T15:35:25Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

44e2c1a

Parents:

313775b (diff), adfdbd5 (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 changes

File:

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

kernel/generic/src/ipc/irq.c

@@ -200 +200 @@
         
         hash_table_insert(&irq_uspace_hash_table, key, &irq->link);
-        list_append(&irq->notif_cfg.link, &box->irq_head);
+        list_append(&irq->notif_cfg.link, &box->irq_list);
         
         irq_spinlock_unlock(&box->irq_lock, false);
@@ -282 +282 @@
         irq_spinlock_lock(&box->irq_lock, false);
         
-        while (box->irq_head.next != &box->irq_head) {
+        while (!list_empty(&box->irq_list)) {
                 DEADLOCK_PROBE_INIT(p_irqlock);
                 
-                irq_t *irq = list_get_instance(box->irq_head.next, irq_t,
+                irq_t *irq = list_get_instance(list_first(&box->irq_list), irq_t,
                     notif_cfg.link);