diff options
Diffstat (limited to 'arch/powerpc/kernel/signal_64.c')
| -rw-r--r-- | arch/powerpc/kernel/signal_64.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c index c1794286098c..345947367ec0 100644 --- a/arch/powerpc/kernel/signal_64.c +++ b/arch/powerpc/kernel/signal_64.c | |||
| @@ -154,11 +154,12 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, | |||
| 154 | * As above, but Transactional Memory is in use, so deliver sigcontexts | 154 | * As above, but Transactional Memory is in use, so deliver sigcontexts |
| 155 | * containing checkpointed and transactional register states. | 155 | * containing checkpointed and transactional register states. |
| 156 | * | 156 | * |
| 157 | * To do this, we treclaim to gather both sets of registers and set up the | 157 | * To do this, we treclaim (done before entering here) to gather both sets of |
| 158 | * 'normal' sigcontext registers with rolled-back register values such that a | 158 | * registers and set up the 'normal' sigcontext registers with rolled-back |
| 159 | * simple signal handler sees a correct checkpointed register state. | 159 | * register values such that a simple signal handler sees a correct |
| 160 | * If interested, a TM-aware sighandler can examine the transactional registers | 160 | * checkpointed register state. If interested, a TM-aware sighandler can |
| 161 | * in the 2nd sigcontext to determine the real origin of the signal. | 161 | * examine the transactional registers in the 2nd sigcontext to determine the |
| 162 | * real origin of the signal. | ||
| 162 | */ | 163 | */ |
| 163 | static long setup_tm_sigcontexts(struct sigcontext __user *sc, | 164 | static long setup_tm_sigcontexts(struct sigcontext __user *sc, |
| 164 | struct sigcontext __user *tm_sc, | 165 | struct sigcontext __user *tm_sc, |
| @@ -184,16 +185,6 @@ static long setup_tm_sigcontexts(struct sigcontext __user *sc, | |||
| 184 | 185 | ||
| 185 | BUG_ON(!MSR_TM_ACTIVE(regs->msr)); | 186 | BUG_ON(!MSR_TM_ACTIVE(regs->msr)); |
| 186 | 187 | ||
| 187 | /* tm_reclaim rolls back all reg states, saving checkpointed (older) | ||
| 188 | * GPRs to thread.ckpt_regs and (if used) FPRs to (newer) | ||
| 189 | * thread.transact_fp and/or VRs to (newer) thread.transact_vr. | ||
| 190 | * THEN we save out FP/VRs, if necessary, to the checkpointed (older) | ||
| 191 | * thread.fr[]/vr[]s. The transactional (newer) GPRs are on the | ||
| 192 | * stack, in *regs. | ||
| 193 | */ | ||
| 194 | tm_enable(); | ||
| 195 | tm_reclaim(¤t->thread, msr, TM_CAUSE_SIGNAL); | ||
| 196 | |||
| 197 | flush_fp_to_thread(current); | 188 | flush_fp_to_thread(current); |
| 198 | 189 | ||
| 199 | #ifdef CONFIG_ALTIVEC | 190 | #ifdef CONFIG_ALTIVEC |
| @@ -711,7 +702,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info, | |||
| 711 | unsigned long newsp = 0; | 702 | unsigned long newsp = 0; |
| 712 | long err = 0; | 703 | long err = 0; |
| 713 | 704 | ||
| 714 | frame = get_sigframe(ka, regs, sizeof(*frame), 0); | 705 | frame = get_sigframe(ka, get_tm_stackpointer(regs), sizeof(*frame), 0); |
| 715 | if (unlikely(frame == NULL)) | 706 | if (unlikely(frame == NULL)) |
| 716 | goto badframe; | 707 | goto badframe; |
| 717 | 708 | ||