aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2010-10-12 22:19:54 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2011-01-07 08:06:59 -0500
commite64f1b7520fa12c8e8e08161a2841ec5510774ac (patch)
tree1f25262b8790ab0d36f65ffde47a626566189576 /arch
parent089e449a82cd5ba8a858dfea88e754afb9341037 (diff)
m68knommu: f_pcr has been gone since headers' merge
sure, it's effectively ifdefed out, but still... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Acked-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/m68knommu/kernel/signal.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/m68knommu/kernel/signal.c b/arch/m68knommu/kernel/signal.c
index e00f1bb12b8a..1c74f3ae2b97 100644
--- a/arch/m68knommu/kernel/signal.c
+++ b/arch/m68knommu/kernel/signal.c
@@ -193,7 +193,7 @@ static inline int rt_restore_fpu_state(struct ucontext *uc)
193 if (FPU_IS_EMU) { 193 if (FPU_IS_EMU) {
194 /* restore fpu control register */ 194 /* restore fpu control register */
195 if (__copy_from_user(current->thread.fpcntl, 195 if (__copy_from_user(current->thread.fpcntl,
196 &uc->uc_mcontext.fpregs.f_pcr, 12)) 196 uc->uc_mcontext.fpregs.f_fpcntl, 12))
197 goto out; 197 goto out;
198 /* restore all other fpu register */ 198 /* restore all other fpu register */
199 if (__copy_from_user(current->thread.fp, 199 if (__copy_from_user(current->thread.fp,
@@ -219,7 +219,7 @@ static inline int rt_restore_fpu_state(struct ucontext *uc)
219 ".chip 68k" 219 ".chip 68k"
220 : /* no outputs */ 220 : /* no outputs */
221 : "m" (*fpregs.f_fpregs), 221 : "m" (*fpregs.f_fpregs),
222 "m" (fpregs.f_pcr)); 222 "m" (*fpregs.f_fpcntl));
223 } 223 }
224 if (context_size && 224 if (context_size &&
225 __copy_from_user(fpstate + 4, (long *)&uc->uc_fpstate + 1, 225 __copy_from_user(fpstate + 4, (long *)&uc->uc_fpstate + 1,
@@ -426,7 +426,7 @@ static inline int rt_save_fpu_state(struct ucontext *uc, struct pt_regs *regs)
426 426
427 if (FPU_IS_EMU) { 427 if (FPU_IS_EMU) {
428 /* save fpu control register */ 428 /* save fpu control register */
429 err |= copy_to_user(&uc->uc_mcontext.fpregs.f_pcr, 429 err |= copy_to_user(uc->uc_mcontext.fpregs.f_pcntl,
430 current->thread.fpcntl, 12); 430 current->thread.fpcntl, 12);
431 /* save all other fpu register */ 431 /* save all other fpu register */
432 err |= copy_to_user(uc->uc_mcontext.fpregs.f_fpregs, 432 err |= copy_to_user(uc->uc_mcontext.fpregs.f_fpregs,
@@ -450,7 +450,7 @@ static inline int rt_save_fpu_state(struct ucontext *uc, struct pt_regs *regs)
450 ".chip 68k" 450 ".chip 68k"
451 : /* no outputs */ 451 : /* no outputs */
452 : "m" (*fpregs.f_fpregs), 452 : "m" (*fpregs.f_fpregs),
453 "m" (fpregs.f_pcr) 453 "m" (*fpregs.f_fpcntl)
454 : "memory"); 454 : "memory");
455 err |= copy_to_user(&uc->uc_mcontext.fpregs, &fpregs, 455 err |= copy_to_user(&uc->uc_mcontext.fpregs, &fpregs,
456 sizeof(fpregs)); 456 sizeof(fpregs));