提交 e64f1b75 编写于 作者: A Al Viro 提交者: Geert Uytterhoeven

m68knommu: f_pcr has been gone since headers' merge

sure, it's effectively ifdefed out, but still...
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Acked-by: NGreg Ungerer <gerg@uclinux.org>
Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
上级 089e449a
...@@ -193,7 +193,7 @@ static inline int rt_restore_fpu_state(struct ucontext *uc) ...@@ -193,7 +193,7 @@ static inline int rt_restore_fpu_state(struct ucontext *uc)
if (FPU_IS_EMU) { if (FPU_IS_EMU) {
/* restore fpu control register */ /* restore fpu control register */
if (__copy_from_user(current->thread.fpcntl, if (__copy_from_user(current->thread.fpcntl,
&uc->uc_mcontext.fpregs.f_pcr, 12)) uc->uc_mcontext.fpregs.f_fpcntl, 12))
goto out; goto out;
/* restore all other fpu register */ /* restore all other fpu register */
if (__copy_from_user(current->thread.fp, if (__copy_from_user(current->thread.fp,
...@@ -219,7 +219,7 @@ static inline int rt_restore_fpu_state(struct ucontext *uc) ...@@ -219,7 +219,7 @@ static inline int rt_restore_fpu_state(struct ucontext *uc)
".chip 68k" ".chip 68k"
: /* no outputs */ : /* no outputs */
: "m" (*fpregs.f_fpregs), : "m" (*fpregs.f_fpregs),
"m" (fpregs.f_pcr)); "m" (*fpregs.f_fpcntl));
} }
if (context_size && if (context_size &&
__copy_from_user(fpstate + 4, (long *)&uc->uc_fpstate + 1, __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,7 +426,7 @@ static inline int rt_save_fpu_state(struct ucontext *uc, struct pt_regs *regs)
if (FPU_IS_EMU) { if (FPU_IS_EMU) {
/* save fpu control register */ /* 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); current->thread.fpcntl, 12);
/* save all other fpu register */ /* save all other fpu register */
err |= copy_to_user(uc->uc_mcontext.fpregs.f_fpregs, 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,7 +450,7 @@ static inline int rt_save_fpu_state(struct ucontext *uc, struct pt_regs *regs)
".chip 68k" ".chip 68k"
: /* no outputs */ : /* no outputs */
: "m" (*fpregs.f_fpregs), : "m" (*fpregs.f_fpregs),
"m" (fpregs.f_pcr) "m" (*fpregs.f_fpcntl)
: "memory"); : "memory");
err |= copy_to_user(&uc->uc_mcontext.fpregs, &fpregs, err |= copy_to_user(&uc->uc_mcontext.fpregs, &fpregs,
sizeof(fpregs)); sizeof(fpregs));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册