diff options
Diffstat (limited to 'arch/powerpc/kernel/entry_64.S')
-rw-r--r-- | arch/powerpc/kernel/entry_64.S | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index 6b8bc0dd09d4..5afd03e5e8b8 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S | |||
@@ -368,13 +368,13 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR) | |||
368 | tabort_syscall: | 368 | tabort_syscall: |
369 | /* Firstly we need to enable TM in the kernel */ | 369 | /* Firstly we need to enable TM in the kernel */ |
370 | mfmsr r10 | 370 | mfmsr r10 |
371 | li r13, 1 | 371 | li r9, 1 |
372 | rldimi r10, r13, MSR_TM_LG, 63-MSR_TM_LG | 372 | rldimi r10, r9, MSR_TM_LG, 63-MSR_TM_LG |
373 | mtmsrd r10, 0 | 373 | mtmsrd r10, 0 |
374 | 374 | ||
375 | /* tabort, this dooms the transaction, nothing else */ | 375 | /* tabort, this dooms the transaction, nothing else */ |
376 | li r13, (TM_CAUSE_SYSCALL|TM_CAUSE_PERSISTENT) | 376 | li r9, (TM_CAUSE_SYSCALL|TM_CAUSE_PERSISTENT) |
377 | TABORT(R13) | 377 | TABORT(R9) |
378 | 378 | ||
379 | /* | 379 | /* |
380 | * Return directly to userspace. We have corrupted user register state, | 380 | * Return directly to userspace. We have corrupted user register state, |
@@ -382,8 +382,8 @@ tabort_syscall: | |||
382 | * resume after the tbegin of the aborted transaction with the | 382 | * resume after the tbegin of the aborted transaction with the |
383 | * checkpointed register state. | 383 | * checkpointed register state. |
384 | */ | 384 | */ |
385 | li r13, MSR_RI | 385 | li r9, MSR_RI |
386 | andc r10, r10, r13 | 386 | andc r10, r10, r9 |
387 | mtmsrd r10, 1 | 387 | mtmsrd r10, 1 |
388 | mtspr SPRN_SRR0, r11 | 388 | mtspr SPRN_SRR0, r11 |
389 | mtspr SPRN_SRR1, r12 | 389 | mtspr SPRN_SRR1, r12 |