Changeset 04803bf in mainline for kernel/generic/include/time/clock.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• kernel/generic/include/time/clock.h (modified) (1 diff)

kernel/generic/include/time/clock.h

@@ -36 +36 @@
 #define KERN_CLOCK_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
-#define HZ              100
+#define HZ  100
 
 /** Uptime structure */
 typedef struct {
-        unative_t seconds1;
-        unative_t useconds;
-        unative_t seconds2;
+        sysarg_t seconds1;
+        sysarg_t useconds;
+        sysarg_t seconds2;
 } uptime_t;