From patchwork Thu Jul 17 09:36:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 4574141 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4B13F9F1D6 for ; Thu, 17 Jul 2014 09:36:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4561F20117 for ; Thu, 17 Jul 2014 09:36:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 634FB2010F for ; Thu, 17 Jul 2014 09:36:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756263AbaGQJgX (ORCPT ); Thu, 17 Jul 2014 05:36:23 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:17783 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752027AbaGQJgU (ORCPT ); Thu, 17 Jul 2014 05:36:20 -0400 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>; 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 To: Joonsoo Kim , Andrew Morton , "Aneesh Kumar K.V" , Michal Nazarewicz Cc: Marek Szyprowski , Minchan Kim , Russell King - ARM Linux , Greg Kroah-Hartman , Paolo Bonzini , Gleb Natapov , Alexander Graf , Benjamin Herrenschmidt , Paul Mackerras , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Zhang Yanfei 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 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Signed-off-by: Marek Szyprowski --- include/linux/cma.h | 4 ++++ 1 file changed, 4 insertions(+) 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;