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: 33778 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f198.google.com (mail-ie0-f198.google.com [209.85.223.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8378720969 for ; Thu, 17 Jul 2014 09:36:30 +0000 (UTC) Received: by mail-ie0-f198.google.com with SMTP id rl12sf17952779iec.9 for ; Thu, 17 Jul 2014 02:36:29 -0700 (PDT) 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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=QK31Adq/aoSWeOmqidHXem2P0JYwk2EgRmwM1Pa6Eow=; b=jQ65PpHxGaQiG1H7GOOIugUZ4h945pCPP+K4Q4zZKw2nRioLcBNyjOh5IKIoJgZ8Je 8xSlDJA9Hxgbg+k07AtM3H0rHeiHeL+oVaU0ei7kvA63DrwKJ/LyecHgwryo4VP5NIMh 1B8LR2Zq0NiXuMoB7W4ilXd8dbLaYbr0LkpjoML5nOqSlJHIUBQ+P66DyAjgGsGbEwTb 2JpcBImfu1kEo4kv+M4R9XwbGHg8aBJnIH6xGUiBEpTUA5BaVcxCskjBcFaFDLnvwDPC rMpalf4hxx7LUSxiNf1K4zSXl8wvn1GsFFninDiWEburpNWmymQzCawgfj5v3tABlGkB sUPg== X-Gm-Message-State: ALoCoQmmvlLp7dGMjFXtOHRY/DppeMmpFIfSUQ4m+ACaAUeA6z/YoT56DrJKThE9EPbNUmmIjOlk X-Received: by 10.42.15.197 with SMTP id m5mr18012055ica.31.1405589789913; Thu, 17 Jul 2014 02:36:29 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.109.245 with SMTP id l108ls650119qgf.83.gmail; Thu, 17 Jul 2014 02:36:29 -0700 (PDT) X-Received: by 10.52.186.103 with SMTP id fj7mr13675783vdc.53.1405589789828; Thu, 17 Jul 2014 02:36:29 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id ad18si1600281vec.43.2014.07.17.02.36.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 17 Jul 2014 02:36:29 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id hy10so3977088vcb.4 for ; Thu, 17 Jul 2014 02:36:29 -0700 (PDT) X-Received: by 10.220.118.136 with SMTP id v8mr11916734vcq.50.1405589789699; Thu, 17 Jul 2014 02:36:29 -0700 (PDT) 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.221.37.5 with SMTP id tc5csp20381vcb; Thu, 17 Jul 2014 02:36:29 -0700 (PDT) X-Received: by 10.68.106.194 with SMTP id gw2mr35616608pbb.85.1405589788689; Thu, 17 Jul 2014 02:36:28 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wh7si1812706pac.46.2014.07.17.02.36.28; Thu, 17 Jul 2014 02:36:28 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756256AbaGQJgX (ORCPT + 27 others); 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: 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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) 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: , 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;