The branch releng/14.0 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=fb4c1757a920be7194fed954e799cfd2a0959be0
commit fb4c1757a920be7194fed954e799cfd2a0959be0 Author: Mateusz Guzik <[email protected]> AuthorDate: 2023-09-18 21:11:26 +0000 Commit: Mateusz Guzik <[email protected]> CommitDate: 2023-09-24 21:45:06 +0000 drm2: whack set-but-not-used warns immediate MFC to unbreak the build Approved by: re (gjb) (cherry picked from commit c9130a46bca272492b4f29429ed340504b8eced7) (cherry picked from commit be6f70428d6c918998e5430d2b60b9a8897ea9d8) --- sys/dev/drm2/drm_fops.c | 2 +- sys/dev/drm2/ttm/ttm_lock.c | 2 +- sys/dev/drm2/ttm/ttm_tt.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/drm2/drm_fops.c b/sys/dev/drm2/drm_fops.c index 5d040e92ed12..316d21a8e731 100644 --- a/sys/dev/drm2/drm_fops.c +++ b/sys/dev/drm2/drm_fops.c @@ -536,7 +536,7 @@ void drm_event_wakeup(struct drm_pending_event *e) { struct drm_file *file_priv; - struct drm_device *dev; + struct drm_device *dev __diagused; file_priv = e->file_priv; dev = file_priv->minor->dev; diff --git a/sys/dev/drm2/ttm/ttm_lock.c b/sys/dev/drm2/ttm/ttm_lock.c index 9a8cafbf2abc..1884acb12118 100644 --- a/sys/dev/drm2/ttm/ttm_lock.c +++ b/sys/dev/drm2/ttm/ttm_lock.c @@ -245,7 +245,7 @@ static void ttm_vt_lock_remove(struct ttm_base_object **p_base) { struct ttm_base_object *base = *p_base; struct ttm_lock *lock = container_of(base, struct ttm_lock, base); - int ret; + int ret __diagused; *p_base = NULL; ret = __ttm_vt_unlock(lock); diff --git a/sys/dev/drm2/ttm/ttm_tt.c b/sys/dev/drm2/ttm/ttm_tt.c index 55131c73bdc3..d52df50adeb3 100644 --- a/sys/dev/drm2/ttm/ttm_tt.c +++ b/sys/dev/drm2/ttm/ttm_tt.c @@ -243,7 +243,7 @@ void ttm_dma_tt_fini(struct ttm_dma_tt *ttm_dma) void ttm_tt_unbind(struct ttm_tt *ttm) { - int ret; + int ret __diagused; if (ttm->state == tt_bound) { ret = ttm->func->unbind(ttm);
