Changeset 0c2d9bb in mainline for kernel/arch/ia64/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/ia64/src/ddi/ddi.c (modified) (2 diffs)

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Jakub Jermar
- * Copyright (c) 2008 Jakub vana
+ * Copyright (c) 2008 Jakub Vana
  * All rights reserved.
  *
@@ -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);
         }