diff options
Diffstat (limited to 'arch/powerpc/kernel/entry_64.S')
| -rw-r--r-- | arch/powerpc/kernel/entry_64.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index 9ae8451bbc83..612ea130c5d2 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S | |||
| @@ -785,6 +785,10 @@ fast_exception_return: | |||
| 785 | andc r4,r4,r0 /* r0 contains MSR_RI here */ | 785 | andc r4,r4,r0 /* r0 contains MSR_RI here */ |
| 786 | mtmsrd r4,1 | 786 | mtmsrd r4,1 |
| 787 | 787 | ||
| 788 | #ifdef CONFIG_PPC_TRANSACTIONAL_MEM | ||
| 789 | /* TM debug */ | ||
| 790 | std r3, PACATMSCRATCH(r13) /* Stash returned-to MSR */ | ||
| 791 | #endif | ||
| 788 | /* | 792 | /* |
| 789 | * r13 is our per cpu area, only restore it if we are returning to | 793 | * r13 is our per cpu area, only restore it if we are returning to |
| 790 | * userspace the value stored in the stack frame may belong to | 794 | * userspace the value stored in the stack frame may belong to |