Changeset ea28272 in mainline for kernel/generic/src/time/clock.c

Timestamp:

2010-12-30T13:43:27Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d770deb

Parents:

d70d80ed (diff), f418e51 (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/src/time/clock.c (modified) (2 diffs)

kernel/generic/src/time/clock.c

@@ -70 +70 @@
  *
  */
-static unative_t secfrag = 0;
+static sysarg_t secfrag = 0;
 
 /** Initialize realtime clock counter
@@ -100 +100 @@
          *
          */
-        sysinfo_set_item_val("clock.cacheable", NULL, (unative_t) true);
-        sysinfo_set_item_val("clock.faddr", NULL, (unative_t) faddr);
+        sysinfo_set_item_val("clock.cacheable", NULL, (sysarg_t) true);
+        sysinfo_set_item_val("clock.faddr", NULL, (sysarg_t) faddr);
 }