summaryrefslogtreecommitdiffstats
path: root/drivers/dma-buf/st-dma-fence.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2019-08-20 14:21:18 +0200
committerChris Wilson <chris@chris-wilson.co.uk>2019-08-20 14:49:15 +0200
commit6ac3a0ebfcc2f0c75ca0ca6974389ce421aa5cbd (patch)
tree76c42f009a05eab541d488de875921e1dd6c2c59 /drivers/dma-buf/st-dma-fence.c
parentdrm/komeda: Add support for 'memory-region' DT node property (diff)
downloadlinux-6ac3a0ebfcc2f0c75ca0ca6974389ce421aa5cbd.tar.xz
linux-6ac3a0ebfcc2f0c75ca0ca6974389ce421aa5cbd.zip
dmabuf: Mark up onstack timer for selftests
The dma-fence selftest uses an on-stack timer that requires explicit annotation for debugobjects. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111442 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/20190820122118.13698-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/dma-buf/st-dma-fence.c')
-rw-r--r--drivers/dma-buf/st-dma-fence.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dma-buf/st-dma-fence.c b/drivers/dma-buf/st-dma-fence.c
index 6fbae6bf6576..e593064341c8 100644
--- a/drivers/dma-buf/st-dma-fence.c
+++ b/drivers/dma-buf/st-dma-fence.c
@@ -373,7 +373,7 @@ static int test_wait_timeout(void *arg)
struct wait_timer wt;
int err = -EINVAL;
- timer_setup(&wt.timer, wait_timer, 0);
+ timer_setup_on_stack(&wt.timer, wait_timer, 0);
wt.f = mock_fence();
if (!wt.f)
@@ -399,6 +399,7 @@ static int test_wait_timeout(void *arg)
err = 0;
err_free:
del_timer_sync(&wt.timer);
+ destroy_timer_on_stack(&wt.timer);
dma_fence_signal(wt.f);
dma_fence_put(wt.f);
return err;