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

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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) (3 diffs)

kernel/generic/src/time/clock.c

@@ -70 +70 @@
  *
  */
-static unative_t secfrag = 0;
+static sysarg_t secfrag = 0;
 
 /** Initialize realtime clock counter
@@ -93 +93 @@
         clock_parea.pbase = (uintptr_t) faddr;
         clock_parea.frames = 1;
+        clock_parea.unpriv = true;
         ddi_parea_register(&clock_parea);
         
@@ -100 +101 @@
          *
          */
-        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.faddr", NULL, (sysarg_t) faddr);
 }