[3.11.y.z extended stable] Patch "ARM: move outer_cache declaration out of ifdef" has been added to staging queue

Luis Henriques luis.henriques at canonical.com
Mon Mar 31 16:26:58 UTC 2014


This is a note to let you know that I have just added a patch titled

    ARM: move outer_cache declaration out of ifdef

to the linux-3.11.y-queue branch of the 3.11.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.11.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.11.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From fd3d7a7e4e11ab7abedceb3f83efd8c02cbfcc89 Mon Sep 17 00:00:00 2001
From: Rob Herring <rob.herring at calxeda.com>
Date: Sat, 17 Aug 2013 20:12:57 -0500
Subject: 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 at calxeda.com>
Cc: Russell King <linux at arm.linux.org.uk>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 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)
--
1.9.1





More information about the kernel-team mailing list