From patchwork Mon Aug 27 12:02:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sedat Dilek X-Patchwork-Id: 1379201 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id B55E23FCAE for ; Tue, 28 Aug 2012 05:41:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C34429F0FF for ; Mon, 27 Aug 2012 22:41:50 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-bk0-f49.google.com (mail-bk0-f49.google.com [209.85.214.49]) by gabe.freedesktop.org (Postfix) with ESMTP id D1A209E710 for ; Mon, 27 Aug 2012 05:02:49 -0700 (PDT) Received: by bkcji2 with SMTP id ji2so1267189bkc.36 for ; Mon, 27 Aug 2012 05:02:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=s6EaLZ+yZDRiqlm3+A6C/yGs1O7ytIwZiTzG1tdjNEM=; b=wmm6BhMNK+buTC2Krj99wJGV7QMIVK40NSmM4Bke2e34+xwaheLHADYMZFAzDGyZoM K74XIFcfUh0k48ytCrG07v6COdH1g2CSWm+5ahSpIGldoRltdb42NmDL28+lkib/E9Td EufZL6gDEc3hhUVRE9W7fuQez92mRlRHrqdh3JOC4NOnkekUzKKPfqkAPBzeYmIwZ0Aj IFggT9JxHiY0dVxGgSLAL/ncWzZtPSwrFhrftgrnzdR1RANfCAMbWYDVfMFGK0i7g8SN X9rN7sTr8GNIlUusJxVXhRJ4ByMGvIFO6Um8HCYuELycBEyE3zfaElfS+ph/uyRsF7BV XLkQ== Received: by 10.204.8.65 with SMTP id g1mr3678607bkg.50.1346068968637; Mon, 27 Aug 2012 05:02:48 -0700 (PDT) Received: from fambox.fritz.box (p5B2EB3D2.dip.t-dialin.net. [91.46.179.210]) by mx.google.com with ESMTPS id y20sm10426802bkv.11.2012.08.27.05.02.47 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 27 Aug 2012 05:02:47 -0700 (PDT) From: Sedat Dilek To: Daniel Vetter , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/i915: Remove __GFP_NO_KSWAPD Date: Mon, 27 Aug 2012 14:02:37 +0200 Message-Id: <1346068957-27754-1-git-send-email-sedat.dilek@gmail.com> X-Mailer: git-send-email 1.7.9.5 X-Mailman-Approved-At: Mon, 27 Aug 2012 22:40:45 -0700 Cc: Sedat Dilek X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org 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: Sedat Dilek --- drivers/gpu/drm/i915/i915_gem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 61612b3..e16f37b 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -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); }