From 4076744180c0da759208b3b7e6eea33bf9ed4960 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 30 Mar 2025 16:57:58 +0000 Subject: [PATCH] ANDROID: GKI: fix build breakage in io_uring during 6.1.132 merge In commit 9aeb68337af7 ("io_uring: get rid of remap_pfn_range() for mapping rings/sqes"), direct access to vm_flags was attempted, but that's not allowed anymore in the Android 6.1 branch due to other upstream changes merged into here. Fix this up by calling the proper vm_flags_set() function instead. Fixes: 9aeb68337af7 ("io_uring: get rid of remap_pfn_range() for mapping rings/sqes") Change-Id: I05bdf96a2f6760e9388237d71d2471c373e29c0c Signed-off-by: Greg Kroah-Hartman --- io_uring/io_uring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 8430c54024fc..e08644810042 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -3226,7 +3226,7 @@ int io_uring_mmap_pages(struct io_ring_ctx *ctx, struct vm_area_struct *vma, { unsigned long nr_pages = npages; - vma->vm_flags |= VM_DONTEXPAND; + vm_flags_set(vma, VM_DONTEXPAND); return vm_insert_pages(vma, vma->vm_start, pages, &nr_pages); }