Changeset 6843a9c in mainline for kernel/arch/sparc64/src/drivers/niagara.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• kernel/arch/sparc64/src/drivers/niagara.c (modified) (1 diff)

kernel/arch/sparc64/src/drivers/niagara.c

@@ -184 +184 @@
         
         instance = malloc(sizeof(niagara_instance_t), FRAME_ATOMIC);
-        instance->thread = thread_create(kniagarapoll, NULL, TASK, 0,
-            "kniagarapoll", true);
+        instance->thread = thread_create(kniagarapoll, NULL, TASK,
+            THREAD_FLAG_UNCOUNTED, "kniagarapoll");
         
         if (!instance->thread) {