From patchwork Fri Dec 13 22:23:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 22384 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C0E9323FBA for ; Fri, 13 Dec 2013 22:26:36 +0000 (UTC) Received: by mail-yh0-f71.google.com with SMTP id f64sf4744613yha.2 for ; Fri, 13 Dec 2013 14:26:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=ONm6DscutNywnBJZwkodG977tQrx+KqNCkVq6/Jb4gc=; b=VWxq4IbVsNs/TH5yx3W70G4VtF1m7hbVZCop99tP2WhqHK0i9tEwOeuU0Dus8zmAYH HTbJidoMfG6XF78D2hjker15KrT5d+pZhs9LPEQKHcCaZ+9/bDa8iPur6KGH9u/4ZbVC JG/nuZA3wZ6hc5njKgRLZenMsd++xK95wtxw6l5xu1466kH6Q0WjQ6P5x7afgzPRpPCn 4nP8rz+i5CYle6qLuEhxfS0K+75NOrQOCItnXnDLGqTNns7z/1cc6Pcafa90CnOTQCsl 82hM4aYCYsn8McK3HnQgGRdzI0ZFB6cqfywKNhqzx6AYgahx2zOBEfXrmBngvzN36LPP xMdQ== X-Gm-Message-State: ALoCoQkW09azai0BnYmO3wJyU0EBpqhyOs3DM5zmaE2VK7mXWQAVXauAqIAiDJnjydd7HPjEh89/ X-Received: by 10.58.128.33 with SMTP id nl1mr2003033veb.28.1386973596595; Fri, 13 Dec 2013 14:26:36 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.128.41 with SMTP id nl9ls1250772qeb.56.gmail; Fri, 13 Dec 2013 14:26:36 -0800 (PST) X-Received: by 10.52.158.170 with SMTP id wv10mr1325604vdb.77.1386973596331; Fri, 13 Dec 2013 14:26:36 -0800 (PST) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id sm7si1186021vdc.136.2013.12.13.14.26.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:26:36 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.178; Received: by mail-ve0-f178.google.com with SMTP id c14so1870151vea.9 for ; Fri, 13 Dec 2013 14:26:36 -0800 (PST) X-Received: by 10.221.49.8 with SMTP id uy8mr1102958vcb.65.1386973596256; Fri, 13 Dec 2013 14:26:36 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp73475vcz; Fri, 13 Dec 2013 14:26:35 -0800 (PST) X-Received: by 10.68.59.202 with SMTP id b10mr6156742pbr.78.1386973595449; Fri, 13 Dec 2013 14:26:35 -0800 (PST) Received: from mail-pa0-f52.google.com (mail-pa0-f52.google.com [209.85.220.52]) by mx.google.com with ESMTPS id gx4si2516314pbc.51.2013.12.13.14.26.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:26:35 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.52 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.220.52; Received: by mail-pa0-f52.google.com with SMTP id ld10so596407pab.39 for ; Fri, 13 Dec 2013 14:26:35 -0800 (PST) X-Received: by 10.67.5.131 with SMTP id cm3mr6091215pad.92.1386973595038; Fri, 13 Dec 2013 14:26:35 -0800 (PST) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id qz9sm7457908pbc.3.2013.12.13.14.26.33 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:26:34 -0800 (PST) From: John Stultz To: LKML Cc: Greg KH , Android Kernel Team , Sumit Semwal , Jesse Barker , Colin Cross , Dima Zavin , John Stultz Subject: [PATCH 019/115] gpu: ion: do not ask for compound pages in system heap Date: Fri, 13 Dec 2013 14:23:53 -0800 Message-Id: <1386973529-4884-20-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1386973529-4884-1-git-send-email-john.stultz@linaro.org> References: <1386973529-4884-1-git-send-email-john.stultz@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.stultz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Dima Zavin Signed-off-by: Dima Zavin [jstultz: modified patch to apply to staging directory] Signed-off-by: John Stultz --- drivers/staging/android/ion/ion_system_heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c index 98711ce..3f607df 100644 --- a/drivers/staging/android/ion/ion_system_heap.c +++ b/drivers/staging/android/ion/ion_system_heap.c @@ -41,7 +41,7 @@ static struct page_info *alloc_largest_available(unsigned long size) for (i = 0; i < ARRAY_SIZE(orders); i++) { if (size < (1 << orders[i]) * PAGE_SIZE) continue; - page = alloc_pages(GFP_HIGHUSER | __GFP_ZERO | __GFP_COMP | + page = alloc_pages(GFP_HIGHUSER | __GFP_ZERO | __GFP_NOWARN | __GFP_NORETRY, orders[i]); if (!page) continue;