3.4-stable patches

added patches:
	arm-move-outer_cache-declaration-out-of-ifdef.patch

diff --git a/queue-3.4/arm-move-outer_cache-declaration-out-of-ifdef.patch b/queue-3.4/arm-move-outer_cache-declaration-out-of-ifdef.patch
new file mode 100644 (file)
index 0000000..dcca542
--- /dev/null
+++ b/queue-3.4/arm-move-outer_cache-declaration-out-of-ifdef.patch
@@ -0,0 +1,36 @@
+From 0b53c11d533a8f6688d73fad0baf67dd08ec1b90 Mon Sep 17 00:00:00 2001
+From: Rob Herring <rob.herring@calxeda.com>
+Date: Sat, 17 Aug 2013 20:12:57 -0500
+Subject: ARM: move outer_cache declaration out of ifdef
+
+From: Rob Herring <rob.herring@calxeda.com>
+
+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>
+
+---
+ arch/arm/include/asm/outercache.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- 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)

diff --git a/queue-3.4/series b/queue-3.4/series
index da394a3754365a932fd3d0026c32b860519c3610..7b3fdb38b3d285998c091c60c7852e72a131bdb0 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -6,3 +6,4 @@ x86-bpf_jit-support-negative-offsets.patch
 deb-pkg-fix-cross-building-linux-headers-package.patch
 p54-clamp-properly-instead-of-just-truncating.patch
 i7300_edac-fix-device-reference-count.patch
+arm-move-outer_cache-declaration-out-of-ifdef.patch