Merge branch 'merge' into next

[karo-tx-linux.git] / arch / powerpc / kernel / tm.S

diff --git a/arch/powerpc/kernel/tm.S b/arch/powerpc/kernel/tm.S
index 0554d1f6d70dae8eeb964806ccd869b9e2a5e89f..7b60b98514691ee554d1140e408c9802f83d21a4 100644 (file)
--- a/arch/powerpc/kernel/tm.S
+++ b/arch/powerpc/kernel/tm.S
@@ -155,10 +155,10 @@ _GLOBAL(tm_reclaim)
        mfvscr  vr0
        li      r6, THREAD_TRANSACT_VSCR
        stvx    vr0, r3, r6
+dont_backup_vec:
        mfspr   r0, SPRN_VRSAVE
        std     r0, THREAD_TRANSACT_VRSAVE(r3)
 
-dont_backup_vec:
        andi.   r0, r4, MSR_FP
        beq     dont_backup_fp
 
@@ -341,11 +341,11 @@ _GLOBAL(tm_recheckpoint)
        lvx     vr0, r3, r5
        mtvscr  vr0
        REST_32VRS(0, r5, r3)                   /* r5 scratch, r3 THREAD ptr */
+dont_restore_vec:
        ld      r5, THREAD_VRSAVE(r3)
        mtspr   SPRN_VRSAVE, r5
 #endif
 
-dont_restore_vec:
        andi.   r0, r4, MSR_FP
        beq     dont_restore_fp