x86/fpu: Remove 'ubuf' parameter from the copy_kernel_to_xstate() API

[people/arne_f/kernel.git] / arch / x86 / kernel / fpu / regset.c

diff --git a/arch/x86/kernel/fpu/regset.c b/arch/x86/kernel/fpu/regset.c
index b188b16841e376574c5f39e55b7b687ffdd09495..785302c75f386dfa33691681c5dc4674fa76a4e4 100644 (file)
--- a/arch/x86/kernel/fpu/regset.c
+++ b/arch/x86/kernel/fpu/regset.c
@@ -92,7 +92,10 @@ int xstateregs_get(struct task_struct *target, const struct user_regset *regset,
        fpu__activate_fpstate_read(fpu);
 
        if (using_compacted_format()) {
-               ret = copyout_from_xsaves(pos, count, kbuf, ubuf, xsave);
+               if (kbuf)
+                       ret = copy_xstate_to_kernel(kbuf, xsave, pos, count);
+               else
+                       ret = copy_xstate_to_user(ubuf, xsave, pos, count);
        } else {
                fpstate_sanitize_xstate(fpu);
                /*
@@ -131,10 +134,14 @@ int xstateregs_set(struct task_struct *target, const struct user_regset *regset,
 
        fpu__activate_fpstate_write(fpu);
 
-       if (boot_cpu_has(X86_FEATURE_XSAVES))
-               ret = copyin_to_xsaves(kbuf, ubuf, xsave);
-       else
+       if (boot_cpu_has(X86_FEATURE_XSAVES)) {
+               if (kbuf)
+                       ret = copy_kernel_to_xstate(kbuf, xsave);
+               else
+                       ret = copy_user_to_xstate(kbuf, ubuf, xsave);
+       } else {
                ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, xsave, 0, -1);
+       }
 
        /*
         * In case of failure, mark all states as init: