diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2010-10-12 22:19:54 -0400 |
|---|---|---|
| committer |   Geert Uytterhoeven <geert@linux-m68k.org> | 2011-01-07 14:06:59 +0100 |
| commit | e64f1b7520fa12c8e8e08161a2841ec5510774ac (patch) | |
| tree | 1f25262b8790ab0d36f65ffde47a626566189576 /arch/m68knommu | |
| parent | m68knommu: Don't lose state if sigframe setup fails (diff) | |
| download | linux-dev-e64f1b7520fa12c8e8e08161a2841ec5510774ac.tar.xz linux-dev-e64f1b7520fa12c8e8e08161a2841ec5510774ac.zip | |
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/m68knommu')
| -rw-r--r-- | arch/m68knommu/kernel/signal.c | 8 |
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) if (FPU_IS_EMU) { /* restore fpu control register */ if (__copy_from_user(current->thread.fpcntl, - &uc->uc_mcontext.fpregs.f_pcr, 12)) + uc->uc_mcontext.fpregs.f_fpcntl, 12)) goto out; /* restore all other fpu register */ if (__copy_from_user(current->thread.fp, @@ -219,7 +219,7 @@ static inline int rt_restore_fpu_state(struct ucontext *uc) ".chip 68k" : /* no outputs */ : "m" (*fpregs.f_fpregs), - "m" (fpregs.f_pcr)); + "m" (*fpregs.f_fpcntl)); } if (context_size && __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) if (FPU_IS_EMU) { /* save fpu control register */ - err |= copy_to_user(&uc->uc_mcontext.fpregs.f_pcr, + err |= copy_to_user(uc->uc_mcontext.fpregs.f_pcntl, current->thread.fpcntl, 12); /* save all other fpu register */ 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) ".chip 68k" : /* no outputs */ : "m" (*fpregs.f_fpregs), - "m" (fpregs.f_pcr) + "m" (*fpregs.f_fpcntl) : "memory"); err |= copy_to_user(&uc->uc_mcontext.fpregs, &fpregs, sizeof(fpregs)); |