Changes in kernel/generic/src/mm/as.c [6785b88b:5071f8a] in mainline

File:

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

kernel/generic/src/mm/as.c

@@ -141 +141 @@
         if (!AS_KERNEL)
                 panic("Cannot create kernel address space.");
-
-        /*
-         * Make sure the kernel address space
-         * reference count never drops to zero.
-         */
-        as_hold(AS_KERNEL);
 }
 
@@ -157 +151 @@
 as_t *as_create(unsigned int flags)
 {
-        as_t *as = (as_t *) slab_alloc(as_cache, 0);
+        as_t *as = (as_t *) slab_alloc(as_cache, FRAME_ATOMIC);
+        if (!as)
+                return NULL;
+
         (void) as_create_arch(as, 0);
 
@@ -1468 +1465 @@
 
 page_fault:
-        if (THREAD->in_copy_from_uspace) {
+        if (THREAD && THREAD->in_copy_from_uspace) {
                 THREAD->in_copy_from_uspace = false;
                 istate_set_retaddr(istate,
                     (uintptr_t) &memcpy_from_uspace_failover_address);
-        } else if (THREAD->in_copy_to_uspace) {
+        } else if (THREAD && THREAD->in_copy_to_uspace) {
                 THREAD->in_copy_to_uspace = false;
                 istate_set_retaddr(istate,
@@ -2243 +2240 @@
  *
  */
-void as_get_area_info(as_t *as, as_area_info_t **obuf, size_t *osize)
+as_area_info_t *as_get_area_info(as_t *as, size_t *osize)
 {
         mutex_lock(&as->lock);
@@ -2251 +2248 @@
 
         size_t isize = area_cnt * sizeof(as_area_info_t);
-        as_area_info_t *info = nfmalloc(isize);
+        as_area_info_t *info = malloc(isize);
+        if (!info) {
+                mutex_unlock(&as->lock);
+                return NULL;
+        }
 
         /* Record area data. */
@@ -2273 +2274 @@
         mutex_unlock(&as->lock);
 
-        *obuf = info;
         *osize = isize;
+        return info;
 }