Merge remote-tracking branch 'asoc/topic/pcm' into asoc-next

[deliverable/linux.git] / drivers / gpu / drm / vmwgfx / vmwgfx_fence.c

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
index e959df6ede83e0a7b3b72e3c16df313f4df98940..26ac8e80a4786a674f52fb72792b4d6160416b27 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
@@ -46,7 +46,7 @@ struct vmw_fence_manager {
        bool goal_irq_on; /* Protected by @goal_irq_mutex */
        bool seqno_valid; /* Protected by @lock, and may not be set to true
                             without the @goal_irq_mutex held. */
-       unsigned ctx;
+       u64 ctx;
 };
 
 struct vmw_user_fence {