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

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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) (3 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.
  *
@@ -56 +56 @@
 {
         if (!task->arch.iomap) {
-                uint8_t *map;
-
                 task->arch.iomap = malloc(sizeof(bitmap_t), 0);
-                map = malloc(BITS2BYTES(IO_MEMMAP_PAGES), 0);
-                if(!map)
+                if (task->arch.iomap == NULL)
                         return ENOMEM;
-                bitmap_initialize(task->arch.iomap, map, IO_MEMMAP_PAGES);
+                
+                void *store = malloc(bitmap_size(IO_MEMMAP_PAGES), 0);
+                if (store == NULL)
+                        return ENOMEM;
+                
+                bitmap_initialize(task->arch.iomap, IO_MEMMAP_PAGES, store);
                 bitmap_clear_range(task->arch.iomap, 0, IO_MEMMAP_PAGES);
         }
@@ -69 +71 @@
         size = ALIGN_UP(size + ioaddr - 4 * iopage, PORTS_PER_PAGE);
         bitmap_set_range(task->arch.iomap, iopage, size / 4);
-
+        
         return 0;
 }