Commit d5500a07 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usercopy-v4.11-rc1.fix' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux 

Pull usercopy test fix from Kees Cook:
 "Fix for non-MMU ARM testing, from Arnd Bergmann"

* tag 'usercopy-v4.11-rc1.fix' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  usercopy: ARM NOMMU has no 64-bit get_user
parents b2e3c431 4deaa6fd

lib/test_user_copy.c

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ 
 * As there doesn't appear to be anything that can safely determine

 * their capability at compile-time, we just have to opt-out certain archs.

 */

#if BITS_PER_LONG == 64 || (!defined(CONFIG_AVR32)  &&		\

#if BITS_PER_LONG == 64 || (!(defined(CONFIG_ARM) && !defined(MMU)) && \

			    !defined(CONFIG_AVR32) &&		\

			    !defined(CONFIG_BLACKFIN) &&	\

			    !defined(CONFIG_M32R) &&		\

			    !defined(CONFIG_M68K) &&		\