Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7c3b937 authored by Sedat Dilek's avatar Sedat Dilek Committed by Daniel Vetter
Browse files

drm/i915: Remove __GFP_NO_KSWAPD 



When I pulled-in today's drm-intel-next into linux-next (next-20120824)
I saw this build-breakage:

drivers/gpu/drm/i915/i915_gem.c: In function 'i915_gem_object_get_pages_gtt':
drivers/gpu/drm/i915/i915_gem.c:1778:40: error: '__GFP_NO_KSWAPD' undeclared (first use in this function)
drivers/gpu/drm/i915/i915_gem.c:1778:40: note: each undeclared identifier is reported only once for each function it appears in

This is caused by commit ba099ef165f8 ("mm: remove __GFP_NO_KSWAPD")
and commit b6beae2c2014 ("mm: remove __GFP_NO_KSWAPD fixes") in
linux-next (next-20120824).

Fix this by removing __GFP_NO_KSWAPD from drm/i915 driver.

Signed-off-by: default avatarSedat Dilek <sedat.dilek@gmail.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent cd7988ee

drivers/gpu/drm/i915/i915_gem.c

+3 −3
Original line number Diff line number Diff line
@@ -1775,7 +1775,7 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) 
	/* Fail silently without starting the shrinker */

	mapping = obj->base.filp->f_path.dentry->d_inode->i_mapping;

	gfp = mapping_gfp_mask(mapping);

	gfp |= __GFP_NORETRY | __GFP_NOWARN | __GFP_NO_KSWAPD;

	gfp |= __GFP_NORETRY | __GFP_NOWARN;

	gfp &= ~(__GFP_IO | __GFP_WAIT);

	for (i = 0; i < page_count; i++) {

		page = shmem_read_mapping_page_gfp(mapping, i, gfp);
@@ -1788,7 +1788,7 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) 
			 * our own buffer, now let the real VM do its job and

			 * go down in flames if truly OOM.

			 */

			gfp &= ~(__GFP_NORETRY | __GFP_NOWARN | __GFP_NO_KSWAPD);

			gfp &= ~(__GFP_NORETRY | __GFP_NOWARN);

			gfp |= __GFP_IO | __GFP_WAIT;



			i915_gem_shrink_all(dev_priv);
@@ -1796,7 +1796,7 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) 
			if (IS_ERR(page))

				goto err_pages;



			gfp |= __GFP_NORETRY | __GFP_NOWARN | __GFP_NO_KSWAPD;

			gfp |= __GFP_NORETRY | __GFP_NOWARN;

			gfp &= ~(__GFP_IO | __GFP_WAIT);

		}