Changeset 3f03199 in mainline for kernel/arch/amd64/src/proc/task.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• kernel/arch/amd64/src/proc/task.c (modified) (3 diffs)

kernel/arch/amd64/src/proc/task.c

@@ -34 +34 @@
 
 #include <proc/task.h>
+#include <typedefs.h>
+#include <adt/bitmap.h>
 #include <mm/slab.h>
-#include <typedefs.h>
 
 /** Perform amd64 specific task initialization.
@@ -45 +46 @@
 {
         task->arch.iomapver = 0;
-        bitmap_initialize(&task->arch.iomap, NULL, 0);
+        bitmap_initialize(&task->arch.iomap, 0, NULL);
 }
 
@@ -55 +56 @@
 void task_destroy_arch(task_t *task)
 {
-        if (task->arch.iomap.map)
-                free(task->arch.iomap.map);
+        if (task->arch.iomap.bits != NULL)
+                free(task->arch.iomap.bits);
 }