Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

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

diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index a8767430df7d6012463c8a34366d251496d15364..0dcbacfdea4b98ca7805624a5ffb59b9298c4992 100644 (file)
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -10,8 +10,9 @@ config ARC
        def_bool y
        select ARCH_SUPPORTS_ATOMIC_RMW if ARC_HAS_LLSC
        select BUILDTIME_EXTABLE_SORT
-       select COMMON_CLK
+       select CLKSRC_OF
        select CLONE_BACKWARDS
+       select COMMON_CLK
        select GENERIC_ATOMIC64
        select GENERIC_CLOCKEVENTS
        select GENERIC_FIND_FIRST_BIT
@@ -30,6 +31,7 @@ config ARC
        select HAVE_MOD_ARCH_SPECIFIC if ARC_DW2_UNWIND
        select HAVE_OPROFILE
        select HAVE_PERF_EVENTS
+       select HANDLE_DOMAIN_IRQ
        select IRQ_DOMAIN
        select MODULES_USE_ELF_RELA
        select NO_BOOTMEM
@@ -95,6 +97,7 @@ source "arch/arc/plat-sim/Kconfig"
 source "arch/arc/plat-tb10x/Kconfig"
 source "arch/arc/plat-axs10x/Kconfig"
 #New platform adds here
+source "arch/arc/plat-eznps/Kconfig"
 
 endmenu
 
@@ -104,6 +107,7 @@ choice
 
 config ISA_ARCOMPACT
        bool "ARCompact ISA"
+       select CPU_NO_EFFICIENT_FFS
        help
          The original ARC ISA of ARC600/700 cores
 
@@ -490,6 +494,17 @@ config ARCH_DMA_ADDR_T_64BIT
 config ARC_PLAT_NEEDS_PHYS_TO_DMA
        bool
 
+config ARC_KVADDR_SIZE
+       int "Kernel Virtaul Address Space size (MB)"
+       range 0 512
+       default "256"
+       help
+         The kernel address space is carved out of 256MB of translated address
+         space for catering to vmalloc, modules, pkmap, fixmap. This however may
+         not suffice vmalloc requirements of a 4K CPU EZChip system. So allow
+         this to be stretched to 512 MB (by extending into the reserved
+         kernel-user gutter)
+
 config ARC_CURR_IN_REG
        bool "Dedicate Register r25 for current_task pointer"
        default y