Skip to content

Commit

Permalink
Merge tag 'usercopy-v4.11-rc1.fix' of git://git.kernel.org/pub/scm/li…
Browse files Browse the repository at this point in the history
…nux/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
  • Loading branch information
Linus Torvalds committed Feb 24, 2017
2 parents b2e3c43 + 4deaa6f commit d5500a0
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/test_user_copy.c
Original file line number Diff line number Diff line change
@@ -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) && \

0 comments on commit d5500a0

Please sign in to comment.