The dma_buf_export function was updated in commit 4bcec44ffaf9 'dma-buf: use
reservation objects' to take a reservation object parameter; update Armada
export method accordingly.

This fixes the following compilation error:

  drivers/gpu/drm/armada/armada_gem.c: In function ‘armada_gem_prime_export’:
  drivers/gpu/drm/armada/armada_gem.c:544:16: error: macro "dma_buf_export" 
requires 5 arguments, but only 4 given

Signed-off-by: Vincent Stehlé <vincent.ste...@laposte.net>
Cc: Russell King <rmk+ker...@arm.linux.org.uk>
Cc: David Airlie <airl...@linux.ie>
Cc: Maarten Lankhorst <maarten.lankho...@canonical.com>
Cc: Sumit Semwal <sumit.sem...@linaro.org>
---

Hi,

This can be seen with e.g. linux next-20140523 and arm allmodconfig.

Best regards,

V.

 drivers/gpu/drm/armada/armada_gem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/armada/armada_gem.c 
b/drivers/gpu/drm/armada/armada_gem.c
index 887816f..7adb0c3 100644
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -541,7 +541,7 @@ armada_gem_prime_export(struct drm_device *dev, struct 
drm_gem_object *obj,
        int flags)
 {
        return dma_buf_export(obj, &armada_gem_prime_dmabuf_ops, obj->size,
-                             O_RDWR);
+                             O_RDWR, NULL);
 }
 
 struct drm_gem_object *
-- 
2.0.0.rc2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to