Changeset 132ab5d1 in mainline for kernel/generic/src/ddi/irq.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

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

kernel/generic/src/ddi/irq.c

@@ -50 +50 @@
 #include <arch.h>
 
-slab_cache_t *irq_slab = NULL;
+slab_cache_t *irq_cache = NULL;
 
 /** Spinlock protecting the kernel IRQ hash table
@@ -97 +97 @@
         last_inr = inrs - 1;
 
-        irq_slab = slab_cache_create("irq_t", sizeof(irq_t), 0, NULL, NULL,
+        irq_cache = slab_cache_create("irq_t", sizeof(irq_t), 0, NULL, NULL,
             FRAME_ATOMIC);
-        assert(irq_slab);
+        assert(irq_cache);
 
         hash_table_create(&irq_uspace_hash_table, chains, 0, &irq_ht_ops);