diff options
| author | Lee Jones <lee.jones@linaro.org> | 2012-01-12 12:50:11 +0000 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2012-01-12 12:50:11 +0000 |
| commit | 72108d578689febd3579bf16be470328ded6c6d9 (patch) | |
| tree | cc36ad5306ce823f8e98956c8f048f48017be3cc /arch/arm/include/asm/outercache.h | |
| parent | 330f78a83c1f47055427e10a68733af77b2cbac8 (diff) | |
| parent | 2150f72fe35397cc6d6ce39866bd0462cfbcc916 (diff) | |
Automatically merging tracking-igloo_kernel-other into merging-stable-linaro-ux500-3.1stable-linaro-ux500-3.1
Conflicting files:
Diffstat (limited to 'arch/arm/include/asm/outercache.h')
| -rw-r--r-- | arch/arm/include/asm/outercache.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h index 7ed8f98b217..170e9037ff1 100644 --- a/arch/arm/include/asm/outercache.h +++ b/arch/arm/include/asm/outercache.h @@ -36,6 +36,7 @@ struct outer_cache_fns { void (*prefetch_enable)(void); void (*prefetch_disable)(void); void (*set_debug)(unsigned long); + void (*resume)(void); }; #ifdef CONFIG_OUTER_CACHE @@ -86,6 +87,10 @@ static inline void outer_prefetch_disable(void) { if (outer_cache.prefetch_disable) outer_cache.prefetch_disable(); +static inline void outer_resume(void) +{ + if (outer_cache.resume) + outer_cache.resume(); } #else |