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

Timestamp:

2017-09-04T19:38:28Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fa32c9f

Parents:

30c27e9

Message:

Allocate the kobjects referenced by capabilities dynamically

File:

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

kernel/generic/src/ipc/irq.c

@@ -307 +307 @@
         if (handle < 0)
                 return handle;
+        
+        irq_t *irq = (irq_t *) malloc(sizeof(irq_t), FRAME_ATOMIC);
+        if (!irq) {
+                cap_free(TASK, handle);
+                return ENOMEM;
+        }
+        
         cap_t *cap = cap_get_current(handle, CAP_TYPE_ALLOCATED);
         assert(cap);
         
-        irq_t *irq = &cap->irq;
         irq_initialize(irq);
         irq->inr = inr;
@@ -321 +327 @@
         irq->notif_cfg.counter = 0;
         
+        cap->kobject = (void *) irq;
+        
         /*
          * Insert the IRQ structure into the uspace IRQ hash table and retype
@@ -359 +367 @@
         irq_spinlock_unlock(&TASK->lock, true);
         
-        irq_t *irq = &cap->irq;
+        irq_t *irq = (irq_t *) cap->kobject;
         
         irq_spinlock_lock(&irq_uspace_hash_table_lock, true);
@@ -376 +384 @@
         
         /* Free up the IRQ capability and the underlying kernel object. */
+        free(cap->kobject);
         cap_free(TASK, handle);