x86/fpu: Rename fregs-related copy functions

[linux-2.6-microblaze.git] / arch / x86 / kernel / fpu / signal.c

diff --git a/arch/x86/kernel/fpu/signal.c b/arch/x86/kernel/fpu/signal.c
index 05f8445..430c66d 100644 (file)
--- a/arch/x86/kernel/fpu/signal.c
+++ b/arch/x86/kernel/fpu/signal.c
@@ -133,7 +133,7 @@ static inline int copy_fpregs_to_sigframe(struct xregs_state __user *buf)
        else if (use_fxsr())
                err = fxsave_to_user_sigframe((struct fxregs_state __user *) buf);
        else
-               err = copy_fregs_to_user((struct fregs_state __user *) buf);
+               err = fnsave_to_user_sigframe((struct fregs_state __user *) buf);
 
        if (unlikely(err) && __clear_user(buf, fpu_user_xstate_size))
                err = -EFAULT;
@@ -274,7 +274,7 @@ static int copy_user_to_fpregs_zeroing(void __user *buf, u64 xbv, int fx_only)
        } else if (use_fxsr()) {
                return fxrstor_from_user_sigframe(buf);
        } else
-               return copy_user_to_fregs(buf);
+               return frstor_from_user_sigframe(buf);
 }
 
 static int __fpu__restore_sig(void __user *buf, void __user *buf_fx, int size)
@@ -465,7 +465,7 @@ static int __fpu__restore_sig(void __user *buf, void __user *buf_fx, int size)
                        goto out;
 
                fpregs_lock();
-               ret = copy_kernel_to_fregs_err(&fpu->state.fsave);
+               ret = frstor_safe(&fpu->state.fsave);
        }
        if (!ret)
                fpregs_mark_activate();