Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth...

[firefly-linux-kernel-4.4.55.git] / arch / mips / mm / cex-oct.S

diff --git a/arch/mips/mm/cex-oct.S b/arch/mips/mm/cex-oct.S
index 3db8553fcd3442d190d0aa5a03890cc13337e85a..9029092aa740df636c2be53033ae3c3399c337ee 100644 (file)
--- a/arch/mips/mm/cex-oct.S
+++ b/arch/mips/mm/cex-oct.S
@@ -18,7 +18,7 @@
  */
        LEAF(except_vec2_octeon)
 
-       .set    push
+       .set    push
        .set    mips64r2
        .set    noreorder
        .set    noat
@@ -27,19 +27,19 @@
        /* due to an errata we need to read the COP0 CacheErr (Dcache)
         * before any cache/DRAM access  */
 
-       rdhwr   k0, $0        /* get core_id */
-       PTR_LA  k1, cache_err_dcache
-       sll     k0, k0, 3
+       rdhwr   k0, $0        /* get core_id */
+       PTR_LA  k1, cache_err_dcache
+       sll     k0, k0, 3
        PTR_ADDU k1, k0, k1    /* k1 = &cache_err_dcache[core_id] */
 
-       dmfc0   k0, CP0_CACHEERR, 1
-       sd      k0, (k1)
-       dmtc0   $0, CP0_CACHEERR, 1
+       dmfc0   k0, CP0_CACHEERR, 1
+       sd      k0, (k1)
+       dmtc0   $0, CP0_CACHEERR, 1
 
-        /* check whether this is a nested exception */
-       mfc0    k1, CP0_STATUS
-       andi    k1, k1, ST0_EXL
-       beqz    k1, 1f
+       /* check whether this is a nested exception */
+       mfc0    k1, CP0_STATUS
+       andi    k1, k1, ST0_EXL
+       beqz    k1, 1f
         nop
        j       cache_parity_error_octeon_non_recoverable
         nop
@@ -48,22 +48,22 @@
 1:     j       handle_cache_err
         nop
 
-       .set    pop
+       .set    pop
        END(except_vec2_octeon)
 
  /* We need to jump to handle_cache_err so that the previous handler
   * can fit within 0x80 bytes. We also move from 0xFFFFFFFFAXXXXXXX
-  * space (uncached) to the 0xFFFFFFFF8XXXXXXX space (cached).  */
+  * space (uncached) to the 0xFFFFFFFF8XXXXXXX space (cached). */
        LEAF(handle_cache_err)
-       .set    push
-        .set    noreorder
-        .set    noat
+       .set    push
+       .set    noreorder
+       .set    noat
 
        SAVE_ALL
        KMODE
-       jal     cache_parity_error_octeon_recoverable
+       jal     cache_parity_error_octeon_recoverable
        nop
-       j       ret_from_exception
+       j       ret_from_exception
        nop
 
        .set pop