Changeset 49ff5f3 in mainline for uspace/app/klog/klog.c

Timestamp:

2012-04-18T20:55:21Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

7769ec9

Parents:

e895352 (diff), 63920b0 (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:

• uspace/app/klog/klog.c (modified) (1 diff)

uspace/app/klog/klog.c

@@ -205 +205 @@
         klog_length = size / sizeof(wchar_t);
         
-        klog = (wchar_t *) as_get_mappable_page(size);
-        if (klog == NULL) {
-                fprintf(stderr, "%s: Unable to allocate virtual memory area\n",
-                    NAME);
-                return ENOMEM;
-        }
-        
-        rc = physmem_map((void *) faddr, (void *) klog, pages,
-            AS_AREA_READ | AS_AREA_CACHEABLE);
+        rc = physmem_map((void *) faddr, pages,
+            AS_AREA_READ | AS_AREA_CACHEABLE, (void *) &klog);
         if (rc != EOK) {
                 fprintf(stderr, "%s: Unable to map klog\n", NAME);