Changeset 03362fbd in mainline for uspace/lib/c/generic/fibril_synch.c

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• uspace/lib/c/generic/fibril_synch.c (modified) (1 diff)

uspace/lib/c/generic/fibril_synch.c

@@ -379 +379 @@
         futex_down(&async_futex);
         if (timeout) {
-                gettimeofday(&wdata.to_event.expires, NULL);
+                getuptime(&wdata.to_event.expires);
                 tv_add(&wdata.to_event.expires, timeout);
                 async_insert_timeout(&wdata);