diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-08 14:41:27 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-08 14:41:27 +0200 |
| commit | 9f19c8a019d7c1fb720133ca86154be1ccff39b5 (patch) | |
| tree | a7c9d53fd675abff61a63352822a3939171ad6aa /include/linux/rolling_buffer.h | |
| parent | 2597b3f0a0e46069ffd754112b2bd33406fb6eec (diff) | |
| parent | f52260f49b107fddbcf7c75f9cf2347a5031f0f7 (diff) | |
| download | linux-next-9f19c8a019d7c1fb720133ca86154be1ccff39b5.tar.gz linux-next-9f19c8a019d7c1fb720133ca86154be1ccff39b5.zip | |
Merge regmap/for-7.4 into regmap-next
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); |