diff --git a/mm/mmap.c b/mm/mmap.c
index bff71a766e0aa8df6acc4e90080386b6ae01902f..ce998ea4e8178d40f74ed574f6c7a6f9b7085915 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2453,6 +2453,9 @@ static void munmap_in_peer_devices(struct mm_struct *mm,
 	if (!obj)
 		return;
 
+	if (mm->gm_as == NULL)
+		return;
+
 	do {
 		xa_lock(obj->logical_page_table);
 		gm_mapping = vm_object_lookup(obj, addr);
@@ -2480,9 +2483,6 @@ static void munmap_in_peer_devices(struct mm_struct *mm,
 		mutex_unlock(&gm_mapping->lock);
 	} while (addr += HPAGE_SIZE, addr != end);
 
-	if (!mm->gm_as)
-		return;
-
 	list_for_each_entry_safe(ctx, tmp, &mm->gm_as->gm_ctx_list, gm_as_link) {
 		if (!gm_dev_is_peer(ctx->dev))
 			continue;
@@ -2747,8 +2747,12 @@ static int alloc_va_in_peer_devices(struct mm_struct *mm,
 	gm_ret_t ret;
 
 	pr_debug("gmem: start mmap, as %p\n", mm->gm_as);
-	if (!mm->gm_as)
-		return -ENODEV;
+	if (!mm->gm_as) {
+		ret = gm_as_create(0, ULONG_MAX, GM_AS_ALLOC_DEFAULT, PAGE_SIZE,
+				   &mm->gm_as);
+		if (ret)
+			return ret;
+	}
 
 	if (!vma->vm_obj)
 		vma->vm_obj = vm_object_create(vma);