Commit d5500a07 authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -30,7 +30,8 @@ ...@@ -30,7 +30,8 @@
* As there doesn't appear to be anything that can safely determine * 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. * 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_BLACKFIN) && \
!defined(CONFIG_M32R) && \ !defined(CONFIG_M32R) && \
!defined(CONFIG_M68K) && \ !defined(CONFIG_M68K) && \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment