diff options
author | Dave Airlie <airlied@redhat.com> | 2022-02-28 07:57:14 +0300 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2022-02-28 07:57:14 +0300 |
commit | 6c64ae228f0826859c56711ce133aff037d6205f (patch) | |
tree | 831f7b3c5a4eb3a5ab932edb6ca27780a316e714 /block/bfq-iosched.c | |
parent | 6d09e5cbc9633fa4df88544952614e9137d274af (diff) | |
parent | 7e57714cd0ad2d5bb90e50b5096a0e671dec1ef3 (diff) | |
download | linux-6c64ae228f0826859c56711ce133aff037d6205f.tar.xz |
Backmerge tag 'v5.17-rc6' into drm-next
This backmerges v5.17-rc6 so I can merge some amdgpu and some tegra changes on top.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'block/bfq-iosched.c')
-rw-r--r-- | block/bfq-iosched.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 0c612a911696..36a66e97e3c2 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -7018,6 +7018,8 @@ static void bfq_exit_queue(struct elevator_queue *e) spin_unlock_irq(&bfqd->lock); #endif + wbt_enable_default(bfqd->queue); + kfree(bfqd); } |