From patchwork Wed May 26 14:18:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Hellstrom X-Patchwork-Id: 102406 Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4QEKll9030834 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 26 May 2010 14:21:23 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1OHHRZ-0000qZ-LZ; Wed, 26 May 2010 14:18:49 +0000 Received: from sfi-mx-3.v28.ch3.sourceforge.com ([172.29.28.123] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1OHHRY-0000qU-R5 for dri-devel@lists.sourceforge.net; Wed, 26 May 2010 14:18:48 +0000 X-ACL-Warn: Received: from smtp-outbound-1.vmware.com ([65.115.85.69]) by sfi-mx-3.v28.ch3.sourceforge.com with esmtp (Exim 4.69) id 1OHHRX-0001Wt-Oq for dri-devel@lists.sourceforge.net; Wed, 26 May 2010 14:18:48 +0000 Received: from mailhost4.vmware.com (mailhost4.vmware.com [10.16.67.124]) by smtp-outbound-1.vmware.com (Postfix) with ESMTP id 0469F1A000; Wed, 26 May 2010 07:18:42 -0700 (PDT) Received: from localhost.localdomain (unknown [10.16.255.6]) by mailhost4.vmware.com (Postfix) with ESMTP id 3853CC9A53; Wed, 26 May 2010 07:18:38 -0700 (PDT) From: Thomas Hellstrom To: airlied@redhat.com Subject: [PATCH 1/2] drm/ttm: Fix cached TTM page allocation. Date: Wed, 26 May 2010 16:18:49 +0200 Message-Id: <1274883530-8017-1-git-send-email-thellstrom@vmware.com> X-Mailer: git-send-email 1.6.2.5 X-Spam-Score: 0.0 (/) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. _SUMMARY_ X-Headers-End: 1OHHRX-0001Wt-Oq Cc: jglisse@redhat.com, dri-devel@lists.sourceforge.net, Thomas Hellstrom X-BeenThere: dri-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.sourceforge.net X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 26 May 2010 14:21:23 +0000 (UTC) diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c index 0d9a42c..b6d1523 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c @@ -671,7 +671,7 @@ int ttm_get_pages(struct list_head *pages, int flags, if (flags & TTM_PAGE_FLAG_DMA32) gfp_flags |= GFP_DMA32; else - gfp_flags |= __GFP_HIGHMEM; + gfp_flags |= GFP_HIGHUSER; for (r = 0; r < count; ++r) { p = alloc_page(gfp_flags);