Changeset 92574f4 in mainline for uspace/lib/c/generic/fibril.c

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/lib/c/generic/fibril.c (modified) (2 diffs)

uspace/lib/c/generic/fibril.c

@@ -115 +115 @@
         fibril->retval = 0;
         fibril->flags = 0;
+        
+        fibril->waits_for = NULL;
         
         return fibril;
@@ -276 +278 @@
         fibril->arg = arg;
 
-        fibril->waits_for = NULL;
-        
         context_save(&fibril->ctx);
         context_set(&fibril->ctx, FADDR(fibril_main), fibril->stack,