Changes in kernel/generic/src/mm/as.c [b7fd2a0:82d515e9] in mainline

File:

• kernel/generic/src/mm/as.c (modified) (7 diffs)

kernel/generic/src/mm/as.c

@@ -111 +111 @@
 as_t *AS_KERNEL = NULL;
 
-NO_TRACE static errno_t as_constructor(void *obj, unsigned int flags)
+NO_TRACE static int as_constructor(void *obj, unsigned int flags)
 {
         as_t *as = (as_t *) obj;
@@ -760 +760 @@
  *
  */
-errno_t as_area_resize(as_t *as, uintptr_t address, size_t size, unsigned int flags)
+int as_area_resize(as_t *as, uintptr_t address, size_t size, unsigned int flags)
 {
         if (!IS_ALIGNED(address, PAGE_SIZE))
@@ -833 +833 @@
                             btree_node_t, leaf_link);
                         
-                        if ((cond = (node->keys != 0))) {
+                        if ((cond = (bool) node->keys)) {
                                 uintptr_t ptr = node->key[node->keys - 1];
                                 size_t node_size =
@@ -969 +969 @@
  *
  */
-errno_t as_area_destroy(as_t *as, uintptr_t address)
+int as_area_destroy(as_t *as, uintptr_t address)
 {
         mutex_lock(&as->lock);
@@ -1085 +1085 @@
  *
  */
-errno_t as_area_share(as_t *src_as, uintptr_t src_base, size_t acc_size,
+int as_area_share(as_t *src_as, uintptr_t src_base, size_t acc_size,
     as_t *dst_as, unsigned int dst_flags_mask, uintptr_t *dst_base,
     uintptr_t bound)
@@ -1248 +1248 @@
  *
  */
-errno_t as_area_change_flags(as_t *as, unsigned int flags, uintptr_t address)
+int as_area_change_flags(as_t *as, unsigned int flags, uintptr_t address)
 {
         /* Flags for the new memory mapping */
@@ -2208 +2208 @@
 }
 
-sys_errno_t sys_as_area_resize(uintptr_t address, size_t size, unsigned int flags)
-{
-        return (sys_errno_t) as_area_resize(AS, address, size, 0);
-}
-
-sys_errno_t sys_as_area_change_flags(uintptr_t address, unsigned int flags)
-{
-        return (sys_errno_t) as_area_change_flags(AS, flags, address);
-}
-
-sys_errno_t sys_as_area_destroy(uintptr_t address)
-{
-        return (sys_errno_t) as_area_destroy(AS, address);
+sysarg_t sys_as_area_resize(uintptr_t address, size_t size, unsigned int flags)
+{
+        return (sysarg_t) as_area_resize(AS, address, size, 0);
+}
+
+sysarg_t sys_as_area_change_flags(uintptr_t address, unsigned int flags)
+{
+        return (sysarg_t) as_area_change_flags(AS, flags, address);
+}
+
+sysarg_t sys_as_area_destroy(uintptr_t address)
+{
+        return (sysarg_t) as_area_destroy(AS, address);
 }