Changeset 6843a9c in mainline for uspace/lib/c/generic/time.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/lib/c/generic/time.c (modified) (2 diffs)

uspace/lib/c/generic/time.c

@@ -43 +43 @@
 #include <ddi.h>
 #include <libc.h>
+#include <unistd.h>
 
 /** Pointer to kernel shared variables with time */
@@ -147 +148 @@
                 }
                 
-                void *addr = as_get_mappable_page(PAGE_SIZE);
-                if (addr == NULL) {
-                        errno = ENOMEM;
-                        return -1;
-                }
-                
-                rc = physmem_map((void *) faddr, addr, 1,
-                    AS_AREA_READ | AS_AREA_CACHEABLE);
+                void *addr;
+                rc = physmem_map((void *) faddr, 1,
+                    AS_AREA_READ | AS_AREA_CACHEABLE, &addr);
                 if (rc != EOK) {
                         as_area_destroy(addr);