dma-buf: drop the _rcu postfix on function names v3

[linux-2.6-block.git] / drivers / gpu / drm / etnaviv / etnaviv_gem.c

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
index 8792d8dd51061a2ce10e91c8147fb0e3762c1438..b8fa6ed3dd7383f201f5354883d75b0930de16e3 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
@@ -390,14 +390,12 @@ int etnaviv_gem_cpu_prep(struct drm_gem_object *obj, u32 op,
        }
 
        if (op & ETNA_PREP_NOSYNC) {
-               if (!dma_resv_test_signaled_rcu(obj->resv,
-                                                         write))
+               if (!dma_resv_test_signaled(obj->resv, write))
                        return -EBUSY;
        } else {
                unsigned long remain = etnaviv_timeout_to_jiffies(timeout);
 
-               ret = dma_resv_wait_timeout_rcu(obj->resv,
-                                                         write, true, remain);
+               ret = dma_resv_wait_timeout(obj->resv, write, true, remain);
                if (ret <= 0)
                        return ret == 0 ? -ETIMEDOUT : ret;
        }