1 files changed, 15 insertions, 1 deletions

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 9b4f29e595a4..b7644310236b 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -738,7 +738,7 @@ config CPU_ICACHE_DISABLE
 
 config CPU_DCACHE_DISABLE
         bool "Disable D-Cache (C-bit)"
-        depends on CPU_CP15
+        depends on CPU_CP15 && !SMP
         help
           Say Y here to disable the processor data cache. Unless
           you have a reason not to or are unsure, say N.
@@ -825,6 +825,20 @@ config KUSER_HELPERS
           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
+        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