kernel: update 3.18 to 3.18.14

[openwrt/staging/chunkeey.git] / target / linux / gemini / patches-3.18 / 060-cache-fa.diff

diff --git a/target/linux/gemini/patches-3.18/060-cache-fa.diff b/target/linux/gemini/patches-3.18/060-cache-fa.diff
index d337607e97ded7cdb72c4b368729c8445b742898..fc74c0af88822cc97d87946bd0327eb34f00ac0f 100644 (file)
--- a/target/linux/gemini/patches-3.18/060-cache-fa.diff
+++ b/target/linux/gemini/patches-3.18/060-cache-fa.diff
@@ -1,5 +1,5 @@
---- a/arch/arm/mm/cache-fa.S   2011-01-05 01:50:19.000000000 +0100
-+++ b/arch/arm/mm/cache-fa.S   2012-07-25 14:30:40.883639094 +0200
+--- a/arch/arm/mm/cache-fa.S
++++ b/arch/arm/mm/cache-fa.S
 @@ -24,7 +24,8 @@
  /*
   * The size of one data cache line.
@@ -10,7 +10,7 @@
  
  /*
   * The total size of the data cache.
-@@ -169,7 +170,17 @@
+@@ -169,7 +170,17 @@ ENTRY(fa_flush_kern_dcache_area)
   *    - start  - virtual start address
   *    - end    - virtual end address
   */
@@ -28,7 +28,7 @@
        tst     r0, #CACHE_DLINESIZE - 1
        bic     r0, r0, #CACHE_DLINESIZE - 1
        mcrne   p15, 0, r0, c7, c14, 1          @ clean & invalidate D entry
-@@ -193,6 +204,10 @@
+@@ -193,6 +204,10 @@ fa_dma_inv_range:
   *    - end    - virtual end address
   */
  fa_dma_clean_range: