OSDN Git Service

dmabuf: Mark up onstack timer for selftests
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 20 Aug 2019 12:21:18 +0000 (13:21 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 20 Aug 2019 12:49:15 +0000 (13:49 +0100)
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
drivers/dma-buf/st-dma-fence.c

index 6fbae6b..e593064 100644 (file)
@@ -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;