Merge branches 'misc' and 'vdso' into for-next

diff --cc arch/arm/mm/Kconfig
index b7644310236b1748c97da4196e5c473791a32a16,9b4f29e595a423f6d00540a9a169decae0f3b4ea,16ae9051b262c146fcbcaa96bc1d2a7e32c73c67..b4f92b9a13ac85c1c425542ff50b6df2783b3c50
--- 1/arch/arm/mm/Kconfig
--- 2/arch/arm/mm/Kconfig
--- 3/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@@@ -825,20 -825,6 -825,20 +825,20 @@@@ config KUSER_HELPER
          Say N here only if you are absolutely certain that you do not
          need these helpers; otherwise, the safe option is to say Y.
   
-       depends on AEABI && MMU
 + config VDSO
 +      bool "Enable VDSO for acceleration of some system calls"
++      depends on AEABI && MMU && CPU_V7
 +      default y if ARM_ARCH_TIMER
 +      select GENERIC_TIME_VSYSCALL
 +      help
 +        Place in the process address space an ELF shared object
 +        providing fast implementations of gettimeofday and
 +        clock_gettime.  Systems that implement the ARM architected
 +        timer will receive maximum benefit.
 + 
 +        You must have glibc 2.22 or later for programs to seamlessly
 +        take advantage of this.
 + 
   config DMA_CACHE_RWFO
        bool "Enable read/write for ownership DMA cache maintenance"
        depends on CPU_V6K && SMP