Merge x86/urgent into x86/fpu

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

diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c
index 1cadb2f..f0f64d4 100644 (file)
--- a/arch/x86/kernel/fpu/xstate.c
+++ b/arch/x86/kernel/fpu/xstate.c
@@ -1225,7 +1225,7 @@ int copy_user_to_xstate(struct xregs_state *xsave, const void __user *ubuf)
        offset = offsetof(struct xregs_state, header);
        size = sizeof(hdr);
 
-       if (__copy_from_user(&hdr, ubuf + offset, size))
+       if (copy_from_user(&hdr, ubuf + offset, size))
                return -EFAULT;
 
        if (validate_user_xstate_header(&hdr))
@@ -1240,7 +1240,7 @@ int copy_user_to_xstate(struct xregs_state *xsave, const void __user *ubuf)
                        offset = xstate_offsets[i];
                        size = xstate_sizes[i];
 
-                       if (__copy_from_user(dst, ubuf + offset, size))
+                       if (copy_from_user(dst, ubuf + offset, size))
                                return -EFAULT;
                }
        }
@@ -1248,7 +1248,7 @@ int copy_user_to_xstate(struct xregs_state *xsave, const void __user *ubuf)
        if (xfeatures_mxcsr_quirk(hdr.xfeatures)) {
                offset = offsetof(struct fxregs_state, mxcsr);
                size = MXCSR_AND_FLAGS_SIZE;
-               if (__copy_from_user(&xsave->i387.mxcsr, ubuf + offset, size))
+               if (copy_from_user(&xsave->i387.mxcsr, ubuf + offset, size))
                        return -EFAULT;
        }