dma-buf: rename reservation_object to dma_resv

[linux.git] / include / drm / ttm / ttm_bo_driver.h

diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
index 3f1935c19a66b99423040f71b28736523db02edb..e88e00c6cbf25faf88512fa61352747193aa011a 100644 (file)
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@ -35,7 +35,7 @@
 #include <linux/workqueue.h>
 #include <linux/fs.h>
 #include <linux/spinlock.h>
-#include <linux/reservation.h>
+#include <linux/dma-resv.h>
 
 #include "ttm_bo_api.h"
 #include "ttm_memory.h"
@@ -654,14 +654,14 @@ static inline int __ttm_bo_reserve(struct ttm_buffer_object *bo,
                if (WARN_ON(ticket))
                        return -EBUSY;
 
-               success = reservation_object_trylock(bo->base.resv);
+               success = dma_resv_trylock(bo->base.resv);
                return success ? 0 : -EBUSY;
        }
 
        if (interruptible)
-               ret = reservation_object_lock_interruptible(bo->base.resv, ticket);
+               ret = dma_resv_lock_interruptible(bo->base.resv, ticket);
        else
-               ret = reservation_object_lock(bo->base.resv, ticket);
+               ret = dma_resv_lock(bo->base.resv, ticket);
        if (ret == -EINTR)
                return -ERESTARTSYS;
        return ret;
@@ -745,10 +745,10 @@ static inline int ttm_bo_reserve_slowpath(struct ttm_buffer_object *bo,
        WARN_ON(!kref_read(&bo->kref));
 
        if (interruptible)
-               ret = reservation_object_lock_slow_interruptible(bo->base.resv,
+               ret = dma_resv_lock_slow_interruptible(bo->base.resv,
                                                                 ticket);
        else
-               reservation_object_lock_slow(bo->base.resv, ticket);
+               dma_resv_lock_slow(bo->base.resv, ticket);
 
        if (likely(ret == 0))
                ttm_bo_del_sub_from_lru(bo);
@@ -773,7 +773,7 @@ static inline void ttm_bo_unreserve(struct ttm_buffer_object *bo)
        else
                ttm_bo_move_to_lru_tail(bo, NULL);
        spin_unlock(&bo->bdev->glob->lru_lock);
-       reservation_object_unlock(bo->base.resv);
+       dma_resv_unlock(bo->base.resv);
 }
 
 /*