diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-08-20 08:21:18 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-08-20 08:49:15 -0400 |
commit | 6ac3a0ebfcc2f0c75ca0ca6974389ce421aa5cbd (patch) | |
tree | 76c42f009a05eab541d488de875921e1dd6c2c59 | |
parent | a8c16b7593bd1a4e613164a47c526ca9d1be764b (diff) |
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
-rw-r--r-- | drivers/dma-buf/st-dma-fence.c | 3 |
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) | |||
373 | struct wait_timer wt; | 373 | struct wait_timer wt; |
374 | int err = -EINVAL; | 374 | int err = -EINVAL; |
375 | 375 | ||
376 | timer_setup(&wt.timer, wait_timer, 0); | 376 | timer_setup_on_stack(&wt.timer, wait_timer, 0); |
377 | 377 | ||
378 | wt.f = mock_fence(); | 378 | wt.f = mock_fence(); |
379 | if (!wt.f) | 379 | if (!wt.f) |
@@ -399,6 +399,7 @@ static int test_wait_timeout(void *arg) | |||
399 | err = 0; | 399 | err = 0; |
400 | err_free: | 400 | err_free: |
401 | del_timer_sync(&wt.timer); | 401 | del_timer_sync(&wt.timer); |
402 | destroy_timer_on_stack(&wt.timer); | ||
402 | dma_fence_signal(wt.f); | 403 | dma_fence_signal(wt.f); |
403 | dma_fence_put(wt.f); | 404 | dma_fence_put(wt.f); |
404 | return err; | 405 | return err; |