| Message ID | 20170816144703.378d4f4d@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index 8fbdefe0216e..15ab3e6792f9 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -2160,7 +2160,7 @@ get_fence_array(struct drm_i915_gem_execbuffer2 *args, return ERR_PTR(-EFAULT); fences = kvmalloc_array(args->num_cliprects, sizeof(*fences), - __GFP_NOWARN | GFP_TEMPORARY); + __GFP_NOWARN | GFP_KERNEL); if (!fences) return ERR_PTR(-ENOMEM);
Hi all, After merging the akpm-current tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/i915/i915_gem_execbuffer.c: In function 'get_fence_array': drivers/gpu/drm/i915/i915_gem_execbuffer.c:2163:20: error: 'GFP_TEMPORARY' undeclared (first use in this function) __GFP_NOWARN | GFP_TEMPORARY); ^ Caused by commit 4d6fc0a48c52 ("mm: treewide: remove GFP_TEMPORARY allocation flag") interacting with commit cf6e7bac6357 ("drm/i915: Add support for drm syncobjs") from the drm-intel tree. I applied the following merge fix patch (and I suspect - given the comments in the former commit message - that this could be applied to the drm-intel tree right now without any problems): From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Wed, 16 Aug 2017 14:41:24 +1000 Subject: [PATCH] drm/i915: fix up for mm: treewide: remove GFP_TEMPORARY allocation flag Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)