Changeset b5ba8f6 in mainline for kernel/arch/ia64/src/ddi/ddi.c

Timestamp:

2013-09-13T13:11:53Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1eaa3cf

Parents:

95027b5 (diff), 1c5f6f8 (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/ia64/src/ddi/ddi.c (modified) (1 diff)

kernel/arch/ia64/src/ddi/ddi.c

@@ -60 +60 @@
                         return ENOMEM;
                 
-                void *store = malloc(bitmap_size(IO_MEMMAP_PAGES, 0), 0);
+                void *store = malloc(bitmap_size(IO_MEMMAP_PAGES), 0);
                 if (store == NULL)
                         return ENOMEM;
                 
-                bitmap_initialize(task->arch.iomap, IO_MEMMAP_PAGES, 0, store);
+                bitmap_initialize(task->arch.iomap, IO_MEMMAP_PAGES, store);
                 bitmap_clear_range(task->arch.iomap, 0, IO_MEMMAP_PAGES);
         }