1 files changed, 15 insertions, 9 deletions

diff --git a/arch/powerpc/include/asm/cacheflush.h b/arch/powerpc/include/asm/cacheflush.h
index 69b6c3d78d6c..217f183aa8c4 100644
--- a/arch/powerpc/include/asm/cacheflush.h
+++ b/arch/powerpc/include/asm/cacheflush.h
@@ -67,11 +67,13 @@ static inline void __flush_dcache_icache_phys(unsigned long physaddr)
  */
 static inline void flush_dcache_range(unsigned long start, unsigned long stop)
 {
-        void *addr = (void *)(start & ~(L1_CACHE_BYTES - 1));
-        unsigned long size = stop - (unsigned long)addr + (L1_CACHE_BYTES - 1);
+        unsigned long shift = l1_cache_shift();
+        unsigned long bytes = l1_cache_bytes();
+        void *addr = (void *)(start & ~(bytes - 1));
+        unsigned long size = stop - (unsigned long)addr + (bytes - 1);
         unsigned long i;
 
-        for (i = 0; i < size >> L1_CACHE_SHIFT; i++, addr += L1_CACHE_BYTES)
+        for (i = 0; i < size >> shift; i++, addr += bytes)
                 dcbf(addr);
         mb();   /* sync */
 }
@@ -83,11 +85,13 @@ static inline void flush_dcache_range(unsigned long start, unsigned long stop)
  */
 static inline void clean_dcache_range(unsigned long start, unsigned long stop)
 {
-        void *addr = (void *)(start & ~(L1_CACHE_BYTES - 1));
-        unsigned long size = stop - (unsigned long)addr + (L1_CACHE_BYTES - 1);
+        unsigned long shift = l1_cache_shift();
+        unsigned long bytes = l1_cache_bytes();
+        void *addr = (void *)(start & ~(bytes - 1));
+        unsigned long size = stop - (unsigned long)addr + (bytes - 1);
         unsigned long i;
 
-        for (i = 0; i < size >> L1_CACHE_SHIFT; i++, addr += L1_CACHE_BYTES)
+        for (i = 0; i < size >> shift; i++, addr += bytes)
                 dcbst(addr);
         mb();   /* sync */
 }
@@ -100,11 +104,13 @@ static inline void clean_dcache_range(unsigned long start, unsigned long stop)
 static inline void invalidate_dcache_range(unsigned long start,
                                            unsigned long stop)
 {
-        void *addr = (void *)(start & ~(L1_CACHE_BYTES - 1));
-        unsigned long size = stop - (unsigned long)addr + (L1_CACHE_BYTES - 1);
+        unsigned long shift = l1_cache_shift();
+        unsigned long bytes = l1_cache_bytes();
+        void *addr = (void *)(start & ~(bytes - 1));
+        unsigned long size = stop - (unsigned long)addr + (bytes - 1);
         unsigned long i;
 
-        for (i = 0; i < size >> L1_CACHE_SHIFT; i++, addr += L1_CACHE_BYTES)
+        for (i = 0; i < size >> shift; i++, addr += bytes)
                 dcbi(addr);
         mb();   /* sync */
 }