Changes in kernel/generic/src/mm/as.c [57355a40:94795812] in mainline

File:

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

kernel/generic/src/mm/as.c

@@ -426 +426 @@
         /*
          * So far, the area does not conflict with other areas.
-         * Check if it is contained in the user address space.
+         * Check if it doesn't conflict with kernel address space.
          */
         if (!KERNEL_ADDRESS_SPACE_SHADOWED) {
-                return iswithin(USER_ADDRESS_SPACE_START,
-                    (USER_ADDRESS_SPACE_END - USER_ADDRESS_SPACE_START) + 1,
-                    addr, P2SZ(count));
+                return !overlaps(addr, P2SZ(count), KERNEL_ADDRESS_SPACE_START,
+                    KERNEL_ADDRESS_SPACE_END - KERNEL_ADDRESS_SPACE_START);
         }
         
@@ -697 +696 @@
                 return ENOENT;
         }
-
-        if (!area->backend->is_resizable(area)) {
-                /*
-                 * The backend does not support resizing for this area.
+        
+        if (area->backend == &phys_backend) {
+                /*
+                 * Remapping of address space areas associated
+                 * with memory mapped devices is not supported.
                  */
                 mutex_unlock(&area->lock);
@@ -1057 +1057 @@
         }
         
-        if (!src_area->backend->is_shareable(src_area)) {
-                /*
-                 * The backend does not permit sharing of this area.
+        if ((!src_area->backend) || (!src_area->backend->share)) {
+                /*
+                 * There is no backend or the backend does not
+                 * know how to share the area.
                  */
                 mutex_unlock(&src_area->lock);