diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2023-04-05 13:36:46 +0000 |
|---|---|---|
| committer | Jaehoon Chung <jh80.chung@samsung.com> | 2024-11-12 13:03:19 +0900 |
| commit | 52af923a9ddc657894a0e99354e28e512aaf9885 (patch) | |
| tree | 314ae7e8ef3d89c1c01931abbf0e0151a9156e72 | |
| parent | 665c63684fffb52a9cc1b19abd8ef310c9250656 (diff) | |
| download | linux-rpi-52af923a9ddc657894a0e99354e28e512aaf9885.tar.gz linux-rpi-52af923a9ddc657894a0e99354e28e512aaf9885.tar.bz2 linux-rpi-52af923a9ddc657894a0e99354e28e512aaf9885.zip | |
ANDROID: ashmem: fix up vm_flags direct access which is not allowed anymore
Commit 1c71222e5f23 ("mm: replace vma->vm_flags direct modifications
with modifier calls") removed the ability to directly access vm_flags, but
provided wrapper functions to do the task instead. Use vm_flags_clear()
to fix the build breakage in the ashmem code because of this change.
Fixes: 1c71222e5f23 ("mm: replace vma->vm_flags direct modifications with modifier calls")
Cc: Suren Baghdasaryan <surenb@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
[sw0312.kim: cherry-pick commit 78ffde117c54 of https://android.googlesource.com/kernel/common/+/refs/heads/android15-6.6 to support waydroid on tizen]
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Change-Id: I865469c1eacd8d037eaaa85eca65e54f717e8706
| -rw-r--r-- | drivers/staging/android/ashmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c index feadf798736d..11521cdb3f58 100644 --- a/drivers/staging/android/ashmem.c +++ b/drivers/staging/android/ashmem.c @@ -401,7 +401,7 @@ static int ashmem_mmap(struct file *file, struct vm_area_struct *vma) ret = -EPERM; goto out; } - vma->vm_flags &= ~calc_vm_may_flags(~asma->prot_mask); + vm_flags_clear(vma, calc_vm_may_flags(~asma->prot_mask)); if (!asma->file) { char *name = ASHMEM_NAME_DEF; |