summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/outercache.h
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2011-11-11 15:29:25 -0800
committerJohn Stultz <john.stultz@linaro.org>2011-11-11 15:29:25 -0800
commitc3e5127312f97482a6a09c0df602c726675eff5b (patch)
tree9082d8201a1daac5ff019ef50322d551711eb250 /arch/arm/include/asm/outercache.h
parent5e537f041bd05cddee0d2a2fb3013ee642064cc6 (diff)
parentf171dfebbdf1de4b6ca267285739e190f95f84cc (diff)
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebaselinux-linaro-3.1-2011.11-0-android-0
Diffstat (limited to 'arch/arm/include/asm/outercache.h')
-rw-r--r--arch/arm/include/asm/outercache.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
index d8387437ec5..53426c66352 100644
--- a/arch/arm/include/asm/outercache.h
+++ b/arch/arm/include/asm/outercache.h
@@ -34,6 +34,7 @@ struct outer_cache_fns {
void (*sync)(void);
#endif
void (*set_debug)(unsigned long);
+ void (*resume)(void);
};
#ifdef CONFIG_OUTER_CACHE
@@ -74,6 +75,12 @@ static inline void outer_disable(void)
outer_cache.disable();
}
+static inline void outer_resume(void)
+{
+ if (outer_cache.resume)
+ outer_cache.resume();
+}
+
#else
static inline void outer_inv_range(phys_addr_t start, phys_addr_t end)