From 670695ff8fdfcf9c3cb789fabada0c55ac3b08c0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 25 Mar 2014 14:07:17 -0700 Subject: [PATCH] 3.4-stable patches added patches: arm-move-outer_cache-declaration-out-of-ifdef.patch --- ...outer_cache-declaration-out-of-ifdef.patch | 36 +++++++++++++++++++ queue-3.4/series | 1 + 2 files changed, 37 insertions(+) create mode 100644 queue-3.4/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 index 00000000000..dcca542b46c --- /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 +Date: Sat, 17 Aug 2013 20:12:57 -0500 +Subject: ARM: move outer_cache declaration out of ifdef + +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 +Signed-off-by: Greg Kroah-Hartman + +--- + 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 da394a37543..7b3fdb38b3d 100644 --- 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 -- 2.47.3