Revert "ARM: proc-v7: Retry uncached stmia if necessary"

This reverts commit 3e1698ed5013c1054e3dbf8a9fcd3a8549a95ece.

diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index 950ceb970470b3795ca0f6b5072d43bbf51d48b0..28c9d32fa99a58081150ae7599569d21969a0e58 100644 (file)
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -288,11 +288,7 @@ __v7_ca17mp_setup:
 1:     adr     r0, __v7_setup_stack_ptr
        ldr     r12, [r0]
        add     r12, r12, r0                    @ the local stack
-1:
        stmia   r12, {r1-r6, lr}                @ v7_invalidate_l1 touches r0-r6
-       ldr     r0, [r12, #(6 * 4)]             @ read back the return address
-       teq     r0, lr                          @ confirm it is correct
-       bne     1b                              @ retrying if not
        bl      v7_invalidate_l1
        ldmia   r12, {r1-r6, lr}
 #ifdef CONFIG_SMP
@@ -478,11 +474,7 @@ __v7_setup:
        adr     r0, __v7_setup_stack_ptr
        ldr     r12, [r0]
        add     r12, r12, r0                    @ the local stack
-1:
        stmia   r12, {r1-r6, lr}                @ v7_invalidate_l1 touches r0-r6
-       ldr     r0, [r12, #(6 * 4)]             @ read back the return address
-       teq     r0, lr                          @ confirm it is correct
-       bne     1b                              @ retrying if not
        bl      v7_invalidate_l1
        ldmia   r12, {r1-r6, lr}