Merge branch 'sh/stable-updates'

Conflicts:
	arch/sh/mm/cache-sh4.c

1 files changed, 10 insertions, 0 deletions

diff --git a/arch/sh/mm/cache.c b/arch/sh/mm/cache.c
index e8810f7fc7ea..fc372a1d3132 100644
--- a/arch/sh/mm/cache.c
+++ b/arch/sh/mm/cache.c
@@ -271,6 +271,8 @@ static void __init emit_cache_params(void)
 
 void __init cpu_cache_init(void)
 {
+        unsigned int cache_disabled = !(__raw_readl(CCR) & CCR_CACHE_ENABLE);
+
         compute_alias(&boot_cpu_data.icache);
         compute_alias(&boot_cpu_data.dcache);
         compute_alias(&boot_cpu_data.scache);
@@ -279,6 +281,13 @@ void __init cpu_cache_init(void)
         __flush_purge_region            = noop__flush_region;
         __flush_invalidate_region       = noop__flush_region;
 
+        /*
+         * No flushing is necessary in the disabled cache case so we can
+         * just keep the noop functions in local_flush_..() and __flush_..()
+         */
+        if (unlikely(cache_disabled))
+                goto skip;
+
         if (boot_cpu_data.family == CPU_FAMILY_SH2) {
                 extern void __weak sh2_cache_init(void);
 
@@ -318,5 +327,6 @@ void __init cpu_cache_init(void)
                 sh5_cache_init();
         }
 
+skip:
         emit_cache_params();
 }