From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 23 Apr 2015 21:05:16 +0000 (+0000)
Subject: Merge branches 'misc' and 'vdso' into for-next
X-Git-Tag: firefly_0821_release~176^2~1870^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6b7acae74fc2ffe6cfd7592e95ca933cadb31219;p=firefly-linux-kernel-4.4.55.git

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

6b7acae74fc2ffe6cfd7592e95ca933cadb31219
diff --cc arch/arm/mm/Kconfig
index b7644310236b,9b4f29e595a4,16ae9051b262..b4f92b9a13ac
--- a/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.
   
 + config VDSO
 + 	bool "Enable VDSO for acceleration of some system calls"
-  	depends on AEABI && MMU
++ 	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