Changeset 0c2d9bb in mainline for kernel/arch/ia32/src/ddi/ddi.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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/arch/ia32/src/ddi/ddi.c (modified) (3 diffs)

kernel/arch/ia32/src/ddi/ddi.c

@@ -68 +68 @@
                  */
                 
-                void *store = malloc(bitmap_size(elements, 0), FRAME_ATOMIC);
+                void *store = malloc(bitmap_size(elements), FRAME_ATOMIC);
                 if (!store)
                         return ENOMEM;
                 
                 bitmap_t oldiomap;
-                bitmap_initialize(&oldiomap, task->arch.iomap.elements, 0,
+                bitmap_initialize(&oldiomap, task->arch.iomap.elements,
                     task->arch.iomap.bits);
                 
-                bitmap_initialize(&task->arch.iomap, elements, 0, store);
+                bitmap_initialize(&task->arch.iomap, elements, store);
                 
                 /*
@@ -129 +129 @@
                 
                 bitmap_t iomap;
-                bitmap_initialize(&iomap, TSS_IOMAP_SIZE * 8, 0,
+                bitmap_initialize(&iomap, TSS_IOMAP_SIZE * 8,
                     CPU->arch.tss->iomap);
                 bitmap_copy(&iomap, &TASK->arch.iomap, elements);
@@ -157 +157 @@
         
         descriptor_t *gdt_p = (descriptor_t *) cpugdtr.base;
-        size_t size = bitmap_size(elements, 0);
+        size_t size = bitmap_size(elements);
         gdt_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE + size);
         gdtr_load(&cpugdtr);