From patchwork Fri Jan 17 08:47:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 23302 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F2B3C20540 for ; Fri, 17 Jan 2014 08:47:41 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id x13sf15443680ief.10 for ; Fri, 17 Jan 2014 00:47:41 -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:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=H9YwxrVP5+i2mZr5bs6pynDgSXtGuNzPagn2RDUDid4=; b=PkZ5dvqwAvfgoEaAYBCuuag2BAnwNPrc/RZbHVVmqfMbmWTZFC0lKM3p/nw2oiEeH+ zo9W/bT1oBuch9A1sFmw79JFDfhZ5GR0iTrZHmcNDKVRySGCGoT6ptVIsWl3WNyAq8oK glHWeGXUX9nzWbxMvfzkEnn9BX0UaDJ41/Xr1emmKhcjM9c20yrOiNvKLBmUGKe+Q7YG QR/5bfQqunEyBDz/j+/jSuWOjXwEli5fOeBlRmzA0T1XKp3w4MNCV+5tMu0c1rZGB6t0 8VHKmldSCQ8FhKvJRaCYesdfsDIJKcr1ES8iygq/n60CJco8PKpXpOwzqKBQffnQUQ4E hy+w== X-Gm-Message-State: ALoCoQmE/z39NTi7cKZxx1p5E6DFaTlwRzDJFdhELtTBTWEwHrCWXXlJ2qE3A5WOGnjvAH+e8k5l X-Received: by 10.182.153.68 with SMTP id ve4mr229087obb.39.1389948461255; Fri, 17 Jan 2014 00:47:41 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.25.42 with SMTP id z10ls1111702qef.63.gmail; Fri, 17 Jan 2014 00:47:41 -0800 (PST) X-Received: by 10.221.30.14 with SMTP id sa14mr48515vcb.44.1389948461109; Fri, 17 Jan 2014 00:47:41 -0800 (PST) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id sp7si4569577vdc.125.2014.01.17.00.47.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 17 Jan 2014 00:47:41 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id la4so1405215vcb.7 for ; Fri, 17 Jan 2014 00:47:41 -0800 (PST) X-Received: by 10.52.117.115 with SMTP id kd19mr244297vdb.15.1389948461023; Fri, 17 Jan 2014 00:47:41 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.59.13.131 with SMTP id ey3csp3915ved; Fri, 17 Jan 2014 00:47:40 -0800 (PST) X-Received: by 10.67.14.231 with SMTP id fj7mr655364pad.115.1389948459692; Fri, 17 Jan 2014 00:47:39 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qv10si9497634pbb.352.2014.01.17.00.47.39; Fri, 17 Jan 2014 00:47:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752194AbaAQIrf (ORCPT + 26 others); Fri, 17 Jan 2014 03:47:35 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:62468 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751892AbaAQIrd (ORCPT ); Fri, 17 Jan 2014 03:47:33 -0500 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MZJ00DEHF387YD0@mailout2.samsung.com> for linux-kernel@vger.kernel.org; Fri, 17 Jan 2014 17:47:32 +0900 (KST) X-AuditID: cbfee61a-b7fb26d00000724f-2a-52d8ee2306b6 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id D7.36.29263.32EE8D25; Fri, 17 Jan 2014 17:47:32 +0900 (KST) Received: from amdc1339.mshome.net ([106.116.147.30]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MZJ002F3F2Z24H0@mmp1.samsung.com>; Fri, 17 Jan 2014 17:47:31 +0900 (KST) From: Marek Szyprowski To: linux-kernel@vger.kernel.org, linux-cris-kernel@axis.com Cc: Marek Szyprowski , Mikael Starvik , Jesper Nilsson Subject: [PATCH] cris: cryptocop: fix GFP_ATOMIC macro usage Date: Fri, 17 Jan 2014 09:47:18 +0100 Message-id: <1389948438-26437-1-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrKJMWRmVeSWpSXmKPExsVy+t9jAV2VdzeCDF7sZ7R4fmgWs8WK1euY LS7vmsNmsfbIXXaLPb9jHFg9rq8L8OjbsorR4/MmuQDmKC6blNSczLLUIn27BK6MlR0TWAqW sldsffqJtYGxm62LkZNDQsBEYtPPOYwQtpjEhXvrgeJcHEICixglbr98BOW0MknMXdzDClLF JmAo0fW2C6xbRMBGYlP3YWYQm1mgTuLBsk1gNcJA8d0fbrOA2CwCqhLtk6+BxXkFPCR6HjwE 2sYBtE1BYs4kmwmM3AsYGVYxiqYWJBcUJ6XnGuoVJ+YWl+al6yXn525iBHv+mdQOxpUNFocY BTgYlXh4JcRvBAmxJpYVV+YeYpTgYFYS4d16EyjEm5JYWZValB9fVJqTWnyIUZqDRUmc90Cr daCQQHpiSWp2ampBahFMlomDU6qBUUF9fiL32fK3Hd6v+9j6HwZXnn6Zu7NlW7WvX9Q2Zuv9 dbUxJmHrVn2srv598Tbfoa+mnb0cd+fxeAnM0lj17eUrlWjDPY8epl4SuGu/nT9ozpdGEban C89P3GXRyMf1WkfmkMy7PLuoH68Nti34NfuN+t0nFhdPHu+W9hJ7t2u39IOEbS8WTVViKc5I NNRiLipOBAB/r01b+AEAAA== Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: m.szyprowski@samsung.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.176 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 Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , GFP_ATOMIC is not a single gfp flag, but a macro which expands to the other flags and LACK of __GFP_WAIT flag. To check if caller wanted to perform an atomic allocation, the code must test __GFP_WAIT flag presence. Signed-off-by: Marek Szyprowski --- arch/cris/arch-v32/drivers/cryptocop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/cris/arch-v32/drivers/cryptocop.c b/arch/cris/arch-v32/drivers/cryptocop.c index 877da19..7f2e60a 100644 --- a/arch/cris/arch-v32/drivers/cryptocop.c +++ b/arch/cris/arch-v32/drivers/cryptocop.c @@ -306,7 +306,7 @@ static void free_cdesc(struct cryptocop_dma_desc *cdesc) static struct cryptocop_dma_desc *alloc_cdesc(int alloc_flag) { - int use_pool = (alloc_flag & GFP_ATOMIC) ? 1 : 0; + int use_pool = (alloc_flag & __GFP_WAIT) ? 0 : 1; struct cryptocop_dma_desc *cdesc; if (use_pool) {