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

Linus Torvalds committed 9 years ago

Commit d5500a02 parents b2e3c43 4deaa6f1 file · +2 −1Browse files

Unified · Split

lib/test_user_copy.c+2−1

@@ -30,7 +30,8 @@ · 29 unmodified lines
30	30	* As there doesn't appear to be anything that can safely determine
31	31	* their capability at compile-time, we just have to opt-out certain archs.
32	32	*/
33		−#if BITS_PER_LONG == 64 \|\| (!defined(CONFIG_AVR32) && \
	33	+#if BITS_PER_LONG == 64 \|\| (!(defined(CONFIG_ARM) && !defined(MMU)) && \
	34	+ !defined(CONFIG_AVR32) && \
34	35	!defined(CONFIG_BLACKFIN) && \
35	36	!defined(CONFIG_M32R) && \
36	37	!defined(CONFIG_M68K) && \