summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2013-08-17 20:12:57 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-30 21:40:30 -0700
commita4d65b8421e38d420fcdaeb50feced86f3f6a5c5 (patch)
tree43131fc14eba33ee0b8f98b606517ba746547f95
parent714c034f82f17dd89b8b112375038d91bde4e129 (diff)
downloadkernel-common-a4d65b8421e38d420fcdaeb50feced86f3f6a5c5.tar.gz
kernel-common-a4d65b8421e38d420fcdaeb50feced86f3f6a5c5.tar.bz2
kernel-common-a4d65b8421e38d420fcdaeb50feced86f3f6a5c5.zip
ARM: move outer_cache declaration out of ifdef
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 <rob.herring@calxeda.com> Cc: Russell King <linux@arm.linux.org.uk> Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm/include/asm/outercache.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
index 53426c66352a..2dd513bdca23 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)