diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2023-06-11 18:22:51 -0700 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2023-06-11 18:22:51 -0700 |
| commit | d08d216746b608e850190b0dc3c9aad1e469f938 (patch) | |
| tree | 207f48fbb0d98b078c771fe6c633cbffa1ecb0e8 | |
| parent | b848e7776afdd0a789db9ca2e5dbe4af446e722e (diff) | |
| parent | 515e920e2db38db565d5d45f9f8ad58155a7884a (diff) | |
| download | abrolhos-d08d216746b608e850190b0dc3c9aad1e469f938.tar.gz | |
Merge android13-gs-pixel-5.10-udc into android13-gs-pixel-5.10-udc-qpr1
SBMerger: 526756187
Change-Id: I338e903c4a2abdf0755402be5ef0f0f74c185cc7
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | drivers/edgetpu/edgetpu-device-group.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/edgetpu/edgetpu-device-group.c b/drivers/edgetpu/edgetpu-device-group.c index 9b85679..c410ebc 100644 --- a/drivers/edgetpu/edgetpu-device-group.c +++ b/drivers/edgetpu/edgetpu-device-group.c @@ -1258,8 +1258,18 @@ static struct page **edgetpu_pin_user_pages(struct edgetpu_device_group *group, kvfree(pages); return ERR_PTR(-ENOMEM); } +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) + down_read(¤t->mm->mmap_sem); +#else + mmap_read_lock(current->mm); +#endif ret = pin_user_pages(host_addr & PAGE_MASK, num_pages, foll_flags, pages, vmas); +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) + up_read(¤t->mm->mmap_sem); +#else + mmap_read_unlock(current->mm); +#endif kvfree(vmas); if (ret < 0) { etdev_dbg(etdev, "pin_user_pages failed %u:%pK-%u: %d", |