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.stehle at laposte.net> Cc: Russell King <rmk+kernel at arm.linux.org.uk> Cc: David Airlie <airlied at linux.ie> Cc: Maarten Lankhorst <maarten.lankhorst at canonical.com> Cc: Sumit Semwal <sumit.semwal at 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