diff options
| author | Dave Airlie <airlied@redhat.com> | 2026-09-22 18:32:50 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2026-09-22 18:35:06 +1000 |
| commit | b0a3a811634aa7422f8a92196db47a06a70bda16 (patch) | |
| tree | 15f8b05b9a0e99e87fecb6751a0a9ef59589c28c /include/linux/rolling_buffer.h | |
| parent | 014ee7742bed896f1aee13ecdee5fe8c7826c0a1 (diff) | |
| parent | 93f51579e7df248780214094418f205253383cc5 (diff) | |
| download | linux-b0a3a811634aa7422f8a92196db47a06a70bda16.tar.gz linux-b0a3a811634aa7422f8a92196db47a06a70bda16.zip | |
Backmerge tag 'v7.3-rc4' into drm-next
Linux 7.3-rc4
Requested by Philipp Stanner for
2ab510e63197360945f915dd5631a77c63ac6b27 would be needed as a groundlayer
for further patches that extend the locking in drm_sched
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/linux/rolling_buffer.h')
| -rw-r--r-- | include/linux/rolling_buffer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/rolling_buffer.h b/include/linux/rolling_buffer.h index 9e5dad29669c..a97f7cfaacaa 100644 --- a/include/linux/rolling_buffer.h +++ b/include/linux/rolling_buffer.h @@ -45,9 +45,9 @@ struct rolling_buffer_snapshot { int rolling_buffer_init(struct rolling_buffer *roll, unsigned int rreq_id, unsigned int direction, gfp_t gfp); int rolling_buffer_make_space(struct rolling_buffer *roll, gfp_t gfp); -ssize_t rolling_buffer_load_from_ra(struct rolling_buffer *roll, - struct readahead_control *ractl, - struct folio_batch *put_batch); +ssize_t rolling_buffer_bulk_load_from_ra(struct rolling_buffer *roll, + struct readahead_control *ractl, + unsigned int rreq_id, gfp_t gfp); ssize_t rolling_buffer_append(struct rolling_buffer *roll, struct folio *folio, unsigned int flags, gfp_t gfp); struct folio_queue *rolling_buffer_delete_spent(struct rolling_buffer *roll); |