From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751327AbaEXVGN (ORCPT ); Sat, 24 May 2014 17:06:13 -0400 Received: from smtpfb2-g21.free.fr ([212.27.42.10]:37293 "EHLO smtpfb2-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751254AbaEXVGK (ORCPT ); Sat, 24 May 2014 17:06:10 -0400 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= To: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org Cc: =?UTF-8?q?Vincent=20Stehl=C3=A9?= , Russell King , David Airlie , Maarten Lankhorst , Sumit Semwal Subject: [PATCH linux-next] DRM: Armada: update dma_buf_export use Date: Sat, 24 May 2014 23:05:44 +0200 Message-Id: <1400965544-20092-1-git-send-email-vincent.stehle@laposte.net> X-Mailer: git-send-email 2.0.0.rc2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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é Cc: Russell King Cc: David Airlie Cc: Maarten Lankhorst Cc: Sumit Semwal --- 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