Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[sfrench/cifs-2.6.git] / arch / x86 / include / asm / uaccess_32.h

diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
index 72950401b223741048943c8ba445db00cc047c54..ba2dc19306303728e1cf8652a20d982dce1e4e2a 100644 (file)
--- a/arch/x86/include/asm/uaccess_32.h
+++ b/arch/x86/include/asm/uaccess_32.h
@@ -29,21 +29,21 @@ raw_copy_from_user(void *to, const void __user *from, unsigned long n)
                switch (n) {
                case 1:
                        ret = 0;
-                       __uaccess_begin();
+                       __uaccess_begin_nospec();
                        __get_user_asm_nozero(*(u8 *)to, from, ret,
                                              "b", "b", "=q", 1);
                        __uaccess_end();
                        return ret;
                case 2:
                        ret = 0;
-                       __uaccess_begin();
+                       __uaccess_begin_nospec();
                        __get_user_asm_nozero(*(u16 *)to, from, ret,
                                              "w", "w", "=r", 2);
                        __uaccess_end();
                        return ret;
                case 4:
                        ret = 0;
-                       __uaccess_begin();
+                       __uaccess_begin_nospec();
                        __get_user_asm_nozero(*(u32 *)to, from, ret,
                                              "l", "k", "=r", 4);
                        __uaccess_end();