Changeset 92574f4 in mainline for uspace/lib/c/generic/as.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:

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

uspace/lib/c/generic/as.c

@@ -41 +41 @@
 #include <bitops.h>
 #include <malloc.h>
-
-/** Last position allocated by as_get_mappable_page */
-static uintptr_t last_allocated = 0;
+#include "private/libc.h"
 
 /** Create address space area.
@@ -104 +102 @@
 }
 
-/** Return pointer to some unmapped area, where fits new as_area
+/** Return pointer to unmapped address space area
  *
  * @param size Requested size of the allocation.
  *
- * @return pointer to the beginning
+ * @return Pointer to the beginning of unmapped address space area.
  *
  */
 void *as_get_mappable_page(size_t size)
 {
-        if (size == 0)
-                return NULL;
-        
-        size_t sz = 1 << (fnzb(size - 1) + 1);
-        if (last_allocated == 0)
-                last_allocated = get_max_heap_addr();
-        
-        /*
-         * Make sure we allocate from naturally aligned address.
-         */
-        uintptr_t res = ALIGN_UP(last_allocated, sz);
-        last_allocated = res + ALIGN_UP(size, PAGE_SIZE);
-        
-        return ((void *) res);
+        return (void *) __SYSCALL2(SYS_AS_GET_UNMAPPED_AREA,
+            (sysarg_t) __entry, (sysarg_t) size);
 }