Subject: Re: linux-next: build failure after merge of the dma-buf tree

From: Maarten Lankhorst <[email-masked]>
Date: Tue, 20 May 2014 10:26:44 +0200

Hey,

op 20-05-14 09:13, Stephen Rothwell schreef:
> Hi Sumit,
>
> After merging the dma-buf tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/tegra/gem.c: In function 'tegra_gem_prime_export':
> drivers/gpu/drm/tegra/gem.c:423:15: error: macro "dma_buf_export" requires 5 arguments, but only 4 given
> drivers/gpu/drm/tegra/gem.c:422:9: error: 'dma_buf_export' undeclared (first use in this function)
>
> Caused by commit 8dfb1f0f8103 ("dma-buf: use reservation objects").
> Grep is your friend ...
>
> I have use the dma-buf tree from next-20140519 for today.

sumits can you amend the commit?
---

diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index bcf9895cef9f..1e9de41a14ea 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -419,7 +419,7 @@ struct dma_buf *tegra_gem_prime_export(struct drm_device *drm,
  				       int flags)
  {
  	return dma_buf_export(gem, &tegra_gem_prime_dmabuf_ops, gem->size,
-			      flags);
+			      flags, NULL);
  }
  
  struct drm_gem_object *tegra_gem_prime_import(struct drm_device *drm,