Message ID | 1405589767-17513-1-git-send-email-m.szyprowski@samsung.com (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show
Return-Path: <linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org> X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 67B781400DD for <patchwork-incoming@ozlabs.org>; Thu, 17 Jul 2014 19:37:03 +1000 (EST) Received: from ozlabs.org (ozlabs.org [103.22.144.67]) by lists.ozlabs.org (Postfix) with ESMTP id 41FD91A049D for <patchwork-incoming@ozlabs.org>; Thu, 17 Jul 2014 19:37:03 +1000 (EST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id D460D1A0292 for <linuxppc-dev@lists.ozlabs.org>; Thu, 17 Jul 2014 19:36:23 +1000 (EST) Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N8U006HWO0CXS40@mailout1.w1.samsung.com> for linuxppc-dev@lists.ozlabs.org; Thu, 17 Jul 2014 10:36:12 +0100 (BST) X-AuditID: cbfec7f4-b7fac6d000006cfe-d7-53c79911cae1 Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 4A.09.27902.11997C35; Thu, 17 Jul 2014 10:36:17 +0100 (BST) Received: from amdc1339.digital.local ([106.116.147.30]) by eusync1.samsung.com (Oracle Communications Messaging Server 7u4-23.01 (7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0N8U00MJ7O0C8A40@eusync1.samsung.com>; Thu, 17 Jul 2014 10:36:17 +0100 (BST) From: Marek Szyprowski <m.szyprowski@samsung.com> To: Joonsoo Kim <iamjoonsoo.kim@lge.com>, Andrew Morton <akpm@linux-foundation.org>, "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>, Michal Nazarewicz <mina86@mina86.com> Subject: [PATCH] CMA: generalize CMA reserved area management functionality (fixup) Date: Thu, 17 Jul 2014 11:36:07 +0200 Message-id: <1405589767-17513-1-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.2 In-reply-to: <53C78ED7.7030002@samsung.com> References: <53C78ED7.7030002@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrJLMWRmVeSWpSXmKPExsVy+t/xy7qCM48HG/yaK2Vx4so/Ros569ew WTx+PY/F4kNTK7PFl5/XGS2aF69ns1jZ3cxm8eaTtsWcqYUWmx5fY7W4vGsOm8W9Nf9ZLW5f 5rX4/f0fq8XaI3fZLRYcb2G1WPb1PbvFmiOL2S32bwNKXDo+k9lBxKOluYfN4//BScwePW9a WD02repk89j0aRK7R9fbK0weJ2b8ZvF4cGgzi8f+uWvYPTYvqfc4P2Mho8e6P6+YPN7vu8rm MXdXH6NH35ZVjB6bT1cHCEZx2aSk5mSWpRbp2yVwZRzduJK1YCZbxamL81kaGHtYuxg5OCQE TCRudZR2MXICmWISF+6tZwOxhQSWMkocvM7fxcgFZPcxSexu+s8CkmATMJToetvFBpIQEdjG KPHyxlwmEIdZ4AqLxL2lnWDtwgKhEpsnr2cGsVkEVCU+9y9nArF5BTwk+p5fZ4NYJyfx/+UK sDingLbE5P4dbCAXCQloSZzuS5/AyLuAkWEVo2hqaXJBcVJ6rqFecWJucWleul5yfu4mRkj0 fNnBuPiY1SFGAQ5GJR7ezs/HgoVYE8uKK3MPMUpwMCuJ8G7rOh4sxJuSWFmVWpQfX1Sak1p8 iJGJg1OqgXHSvLRpjt4FzHM/tVbNcDMRV+xveanop1Jbwi3GX3k7raTrk6zC7/p11+8v0Pd/ aXj5a9RM45AT/kG3W2ZP7ZwfcUI7p/XH9LPL5FaKGX9KVk2W7qzIOzU/KTRisb1puuPE36ce X5mrolnoOTPN7p9dm8MRhXCZZP3HjaySGfzcmU8fT1l0RomlOCPRUIu5qDgRAJ3wGFN8AgAA Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>, kvm@vger.kernel.org, linux-mm@kvack.org, Gleb Natapov <gleb@kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Alexander Graf <agraf@suse.de>, kvm-ppc@vger.kernel.org, linux-kernel@vger.kernel.org, Minchan Kim <minchan@kernel.org>, Paul Mackerras <paulus@samba.org>, Paolo Bonzini <pbonzini@redhat.com>, Zhang Yanfei <zhangyanfei@cn.fujitsu.com>, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, Marek Szyprowski <m.szyprowski@samsung.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.lists.ozlabs.org> List-Unsubscribe: <https://lists.ozlabs.org/options/linuxppc-dev>, <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe> List-Archive: <http://lists.ozlabs.org/pipermail/linuxppc-dev/> List-Post: <mailto:linuxppc-dev@lists.ozlabs.org> List-Help: <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help> List-Subscribe: <https://lists.ozlabs.org/listinfo/linuxppc-dev>, <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" <linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org> |
diff --git a/include/linux/cma.h b/include/linux/cma.h index 9a18a2b1934c..c077635cad76 100644 --- a/include/linux/cma.h +++ b/include/linux/cma.h @@ -5,7 +5,11 @@ * There is always at least global CMA area and a few optional * areas configured in kernel .config. */ +#ifdef CONFIG_CMA #define MAX_CMA_AREAS (1 + CONFIG_CMA_AREAS) +#else +#define MAX_CMA_AREAS (0) +#endif struct cma;
MAX_CMA_AREAS is used by other subsystems (i.e. arch/arm/mm/dma-mapping.c), so we need to provide correct definition even if CMA is disabled. This patch fixes this issue. Reported-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- include/linux/cma.h | 4 ++++ 1 file changed, 4 insertions(+)