From patchwork Fri Mar 21 09:48:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 26797 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C271920143 for ; Fri, 21 Mar 2014 09:49:03 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id wo20sf8001177obc.10 for ; Fri, 21 Mar 2014 02:49:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:mime-version:cc:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=Xs0AiBvIQEbpFieIFTarZ9QvaT5P4sfNirvrPiSNdHw=; b=j14bxnRftEyXSnJpK41ricdkSzwXDL/eQztETRc0nphzhDsMEdo76Qnazt+aTDPX3z ZImQhxuEXHRDG/B8F6K1/O9TrO16YvYoAXE+P3+b3Smap50AnmkzkbFBRvckuTu4THjR 0ybrmrRRxnYWQz5obGuTIx0N0sPCjh9PWQx3GogGUBZNjLgGvIgRw1YykcNUnXzNorE+ I9jgxPPNhUgnWzldH7bCbLbvrEFfKpLUZmnG7xV3SR7gaDKhyV3kNkn51kUzSgcZ2iU6 WTvQiArtC275iueHg1fo44/nPWJtpgFC2Lj7K7e+wwlf9iCI1aNEn90aHwC36DBcck6e w87g== X-Gm-Message-State: ALoCoQkjEOZlKqId9dtIM7LLqqVcjhM8NGJyhXB1Ig/lJMG0YIzdrTWUBKBenfuHeUj41m/WLmHN X-Received: by 10.182.22.133 with SMTP id d5mr5840083obf.27.1395395343364; Fri, 21 Mar 2014 02:49:03 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.22.167 with SMTP id 36ls579945qgn.55.gmail; Fri, 21 Mar 2014 02:49:03 -0700 (PDT) X-Received: by 10.220.104.210 with SMTP id q18mr27568357vco.9.1395395343252; Fri, 21 Mar 2014 02:49:03 -0700 (PDT) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id xv15si1027488veb.98.2014.03.21.02.49.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 02:49:03 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.181 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.181; Received: by mail-ve0-f181.google.com with SMTP id oy12so2312405veb.12 for ; Fri, 21 Mar 2014 02:49:03 -0700 (PDT) X-Received: by 10.221.4.66 with SMTP id ob2mr7743779vcb.28.1395395343173; Fri, 21 Mar 2014 02:49:03 -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.220.78.9 with SMTP id i9csp17909vck; Fri, 21 Mar 2014 02:49:02 -0700 (PDT) X-Received: by 10.180.182.166 with SMTP id ef6mr1337485wic.29.1395395342091; Fri, 21 Mar 2014 02:49:02 -0700 (PDT) Received: from casper.infradead.org (casper.infradead.org. [2001:770:15f::2]) by mx.google.com with ESMTPS id hi13si691726wib.46.2014.03.21.02.49.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Mar 2014 02:49:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:770:15f::2 as permitted sender) client-ip=2001:770:15f::2; Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQw4B-00023A-Pv; Fri, 21 Mar 2014 09:48:43 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQw49-0006fq-Ca; Fri, 21 Mar 2014 09:48:41 +0000 Received: from smtp.citrix.com ([66.165.176.89]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQw46-0006f1-Ao for linux-arm-kernel@lists.infradead.org; Fri, 21 Mar 2014 09:48:39 +0000 X-IronPort-AV: E=Sophos;i="4.97,702,1389744000"; d="scan'208";a="113577863" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 21 Mar 2014 09:48:15 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.2.342.4; Fri, 21 Mar 2014 05:48:15 -0400 Received: from cosworth.uk.xensource.com ([10.80.16.52] helo=cosworth.uk.xensource.com.) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1WQw3j-0003K0-19; Fri, 21 Mar 2014 09:48:15 +0000 From: Ian Campbell To: Greg KH , Subject: [PATCH 1/2] ARM: move outer_cache declaration out of ifdef Date: Fri, 21 Mar 2014 09:48:13 +0000 Message-ID: <1395395294-17848-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <20140320233920.GD24571@kroah.com> References: <20140320233920.GD24571@kroah.com> MIME-Version: 1.0 X-DLP: MIA1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140321_054838_511722_35ED080C X-CRM114-Status: UNSURE ( 9.01 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -6.9 (------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-6.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [66.165.176.89 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Rob.Herring@linaro.org, Russell King , Rob Herring , linux-arm-kernel@lists.infradead.org, Ian Campbell X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.181 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 From: Rob Herring commit 0b53c11d533a8f6688d73fad0baf67dd08ec1b90 upstream. Move the outer_cache declaration of the CONFIG_OUTER_CACHE ifdef so that outer_cache can be used inside IS_ENABLED condition. Signed-off-by: Rob Herring Cc: Russell King Signed-off-by: Ian Campbell --- arch/arm/include/asm/outercache.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h index 12f71a1..f94784f 100644 --- a/arch/arm/include/asm/outercache.h +++ b/arch/arm/include/asm/outercache.h @@ -37,10 +37,10 @@ struct outer_cache_fns { void (*resume)(void); }; -#ifdef CONFIG_OUTER_CACHE - extern struct outer_cache_fns outer_cache; +#ifdef CONFIG_OUTER_CACHE + static inline void outer_inv_range(phys_addr_t start, phys_addr_t end) { if (outer_cache.inv_range)