Changeset 89c57b6 in mainline for kernel/generic/include/time/clock.h

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/generic/include/time/clock.h (modified) (1 diff)

kernel/generic/include/time/clock.h

@@ -42 +42 @@
 /** Uptime structure */
 typedef struct {
-        unative_t seconds1;
-        unative_t useconds;
-        unative_t seconds2;
+        sysarg_t seconds1;
+        sysarg_t useconds;
+        sysarg_t seconds2;
 } uptime_t;