diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-21 17:35:46 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-21 17:35:58 +0100 |
| commit | 386bae8db529ff6153e5f3556cc3fd76af38509b (patch) | |
| tree | 3eaa0da7e34c0bb1b4d960412ab3b0512e21f211 /drivers/media | |
| parent | e69cbb9f0a0c6988f9d72af2dfa59d0730557523 (diff) | |
| parent | 1edcec18cfb7195c33072594aa02a442801dcf57 (diff) | |
Merge tag 'v5.15.134' into fslc-5.15-2.2.x-imx
This is the 5.15.134 stable release
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/common/videobuf2/frame_vector.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/common/videobuf2/frame_vector.c b/drivers/media/common/videobuf2/frame_vector.c index 144027035892..07ebe4424df3 100644 --- a/drivers/media/common/videobuf2/frame_vector.c +++ b/drivers/media/common/videobuf2/frame_vector.c @@ -30,6 +30,10 @@ * different type underlying the specified range of virtual addresses. * When the function isn't able to map a single page, it returns error. * + * Note that get_vaddr_frames() cannot follow VM_IO mappings. It used + * to be able to do that, but that could (racily) return non-refcounted + * pfns. + * * This function takes care of grabbing mmap_lock as necessary. */ int get_vaddr_frames(unsigned long start, unsigned int nr_frames, @@ -55,8 +59,6 @@ int get_vaddr_frames(unsigned long start, unsigned int nr_frames, if (likely(ret > 0)) return ret; - /* This used to (racily) return non-refcounted pfns. Let people know */ - WARN_ONCE(1, "get_vaddr_frames() cannot follow VM_IO mapping"); vec->nr_frames = 0; return ret ? ret : -EFAULT; } |