diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-04-15 07:51:49 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-04-15 07:51:49 +0200 |
| commit | f06ddb53096b4cddad2c530125a78a3c2a1d28a4 (patch) | |
| tree | 36a05922af22272dc82357ce82be21a3a9214bd0 /block/bfq-iosched.h | |
| parent | Merge branch 'drm-next-5.2' of git://people.freedesktop.org/~agd5f/linux into... (diff) | |
| parent | Linux 5.1-rc5 (diff) | |
| download | linux-f06ddb53096b4cddad2c530125a78a3c2a1d28a4.tar.xz linux-f06ddb53096b4cddad2c530125a78a3c2a1d28a4.zip | |
BackMerge v5.1-rc5 into drm-next
Need rc5 for udl fix to add udl cleanups on top.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'block/bfq-iosched.h')
| -rw-r--r-- | block/bfq-iosched.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index 062e1c4787f4..86394e503ca9 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -995,7 +995,7 @@ bool __bfq_deactivate_entity(struct bfq_entity *entity, bool ins_into_idle_tree); bool next_queue_may_preempt(struct bfq_data *bfqd); struct bfq_queue *bfq_get_next_queue(struct bfq_data *bfqd); -void __bfq_bfqd_reset_in_service(struct bfq_data *bfqd); +bool __bfq_bfqd_reset_in_service(struct bfq_data *bfqd); void bfq_deactivate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq, bool ins_into_idle_tree, bool expiration); void bfq_activate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq); |