Merge tag 'arc-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[sfrench/cifs-2.6.git] / arch / arc / Kconfig

diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index c84e67fdea095cbed225edac052f4ce07007abb9..9d5fd00d9e91bf0caa066bc0597475723a014328 100644 (file)
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -39,7 +39,7 @@ config ARC
        select OF
        select OF_EARLY_FLATTREE
        select OF_RESERVED_MEM
-       select PERF_USE_VMALLOC
+       select PERF_USE_VMALLOC if ARC_CACHE_VIPT_ALIASING
        select HAVE_DEBUG_STACKOVERFLOW
        select HAVE_GENERIC_DMA_COHERENT
        select HAVE_KERNEL_GZIP
@@ -298,7 +298,7 @@ config ARC_MMU_V1
 config ARC_MMU_V2
        bool "MMU v2"
        help
-         Fixed the deficiency of v1 - possible thrashing in memcpy sceanrio
+         Fixed the deficiency of v1 - possible thrashing in memcpy scenario
          when 2 D-TLB and 1 I-TLB entries index into same 2way set.
 
 config ARC_MMU_V3
@@ -371,7 +371,7 @@ config ARC_FPU_SAVE_RESTORE
        bool "Enable FPU state persistence across context switch"
        default n
        help
-         Double Precision Floating Point unit had dedictaed regs which
+         Double Precision Floating Point unit had dedicated regs which
          need to be saved/restored across context-switch.
          Note that ARC FPU is overly simplistic, unlike say x86, which has
          hardware pieces to allow software to conditionally save/restore,
@@ -467,7 +467,7 @@ config ARC_PLAT_NEEDS_PHYS_TO_DMA
        bool
 
 config ARC_KVADDR_SIZE
-       int "Kernel Virtaul Address Space size (MB)"
+       int "Kernel Virtual Address Space size (MB)"
        range 0 512
        default "256"
        help