Hi all,
After merging the mm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/accel/ivpu/ivpu_gem.c: In function 'ivpu_bo_mmap':
drivers/accel/ivpu/ivpu_gem.c:449:23: error: assignment of read-only member 'vm_flags'
449 | vma->vm_flags |= VM_PFNMAP | VM_DONTEXPAND;
| ^~
Caused by commit
b95a895848b9 ("mm: introduce vma->vm_flags wrapper functions")
interacting with commit
647371a6609d ("accel/ivpu: Add GEM buffer object management")
from the drm tree.
I have applied the following merge fix patch for today.
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 27 Jan 2023 17:12:37 +1100
Subject: [PATCH] accel/ivpu: fix up for "mm: introduce vma->vm_flags wrapper functions"
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
drivers/accel/ivpu/ivpu_gem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/accel/ivpu/ivpu_gem.c b/drivers/accel/ivpu/ivpu_gem.c
index d1f923971b4c..12b219dd4f36 100644
--- a/drivers/accel/ivpu/ivpu_gem.c
+++ b/drivers/accel/ivpu/ivpu_gem.c
@@ -446,7 +446,7 @@ static int ivpu_bo_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)
return dma_buf_mmap(obj->dma_buf, vma, 0);
}
- vma->vm_flags |= VM_PFNMAP | VM_DONTEXPAND;
+ vm_flags_set(vma, VM_PFNMAP | VM_DONTEXPAND);
vma->vm_page_prot = ivpu_bo_pgprot(bo, vm_get_page_prot(vma->vm_flags));
return 0;
--
2.35.1
--
Cheers,
Stephen Rothwell
Attachment:
pgp1aq_TOB1UI.pgp
Description: OpenPGP digital signature
