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

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• kernel/generic/src/time/clock.c (modified) (2 diffs)

kernel/generic/src/time/clock.c

@@ -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, (sysarg_t) true);
         sysinfo_set_item_val("clock.faddr", NULL, (sysarg_t) faddr);
 }