Merge tag 'v4.4.51' into linux-linaro-lsk-v4.4
authorAlex Shi <alex.shi@linaro.org>
Fri, 24 Feb 2017 04:03:18 +0000 (12:03 +0800)
committerAlex Shi <alex.shi@linaro.org>
Fri, 24 Feb 2017 04:03:18 +0000 (12:03 +0800)
 This is the 4.4.51 stable release

1  2 
kernel/futex.c

diff --combined kernel/futex.c
index e8af73cc51a7cd6bf453aaf03e5ccd5842aacca2,9d251dc3ec40c9be31e6bcf2445f146794f8320d..beb042dcc3329dc67281cb119bd61ba95fbee82f
@@@ -681,7 -681,7 +681,7 @@@ static int get_futex_value_locked(u32 *
        int ret;
  
        pagefault_disable();
 -      ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
 +      ret = __get_user(*dest, from);
        pagefault_enable();
  
        return ret ? -EFAULT : 0;
@@@ -3199,4 -3199,4 +3199,4 @@@ static int __init futex_init(void
  
        return 0;
  }
__initcall(futex_init);
core_initcall(futex_init);