These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / xtensa / Kconfig

diff --git a/kernel/arch/xtensa/Kconfig b/kernel/arch/xtensa/Kconfig
index 87be10e..82044f7 100644 (file)
--- a/kernel/arch/xtensa/Kconfig
+++ b/kernel/arch/xtensa/Kconfig
@@ -14,12 +14,16 @@ config XTENSA
        select GENERIC_IRQ_SHOW
        select GENERIC_PCI_IOMAP
        select GENERIC_SCHED_CLOCK
+       select HAVE_DMA_API_DEBUG
+       select HAVE_DMA_ATTRS
        select HAVE_FUNCTION_TRACER
+       select HAVE_FUTEX_CMPXCHG if !MMU
        select HAVE_IRQ_TIME_ACCOUNTING
        select HAVE_OPROFILE
        select HAVE_PERF_EVENTS
        select IRQ_DOMAIN
        select MODULES_USE_ELF_RELA
+       select PERF_USE_VMALLOC
        select VIRT_TO_BUS
        help
          Xtensa processors are 32-bit RISC machines designed by Tensilica
@@ -61,9 +65,7 @@ config TRACE_IRQFLAGS_SUPPORT
        def_bool y
 
 config MMU
-       bool
-       default n if !XTENSA_VARIANT_CUSTOM
-       default XTENSA_VARIANT_MMU if XTENSA_VARIANT_CUSTOM
+       def_bool n
 
 config VARIANT_IRQ_SWITCH
        def_bool n
@@ -71,9 +73,6 @@ config VARIANT_IRQ_SWITCH
 config HAVE_XTENSA_GPIO32
        def_bool n
 
-config MAY_HAVE_SMP
-       def_bool n
-
 menu "Processor type and features"
 
 choice
@@ -100,7 +99,6 @@ config XTENSA_VARIANT_DC233C
 
 config XTENSA_VARIANT_CUSTOM
        bool "Custom Xtensa processor configuration"
-       select MAY_HAVE_SMP
        select HAVE_XTENSA_GPIO32
        help
          Select this variant to use a custom Xtensa processor configuration.
@@ -126,10 +124,21 @@ config XTENSA_VARIANT_MMU
        bool "Core variant has a Full MMU (TLB, Pages, Protection, etc)"
        depends on XTENSA_VARIANT_CUSTOM
        default y
+       select MMU
        help
          Build a Conventional Kernel with full MMU support,
          ie: it supports a TLB with auto-loading, page protection.
 
+config XTENSA_VARIANT_HAVE_PERF_EVENTS
+       bool "Core variant has Performance Monitor Module"
+       depends on XTENSA_VARIANT_CUSTOM
+       default n
+       help
+         Enable if core variant has Performance Monitor Module with
+         External Registers Interface.
+
+         If unsure, say N.
+
 config XTENSA_UNALIGNED_USER
        bool "Unaligned memory access in use space"
        help
@@ -143,7 +152,7 @@ source "kernel/Kconfig.preempt"
 
 config HAVE_SMP
        bool "System Supports SMP (MX)"
-       depends on MAY_HAVE_SMP
+       depends on XTENSA_VARIANT_CUSTOM
        select XTENSA_MX
        help
          This option is use to indicate that the system-on-a-chip (SOC)
@@ -151,7 +160,7 @@ config HAVE_SMP
          the CPU core definition and currently needs to be selected manually.
 
          Multiprocessor support in implemented with external cache and
-         interrupt controlers.
+         interrupt controllers.
 
          The MX interrupt distributer adds Interprocessor Interrupts
          and causes the IRQ numbers to be increased by 4 for devices
@@ -389,6 +398,20 @@ config SIMDISK1_FILENAME
 
 source "mm/Kconfig"
 
+config FORCE_MAX_ZONEORDER
+       int "Maximum zone order"
+       default "11"
+       help
+         The kernel memory allocator divides physically contiguous memory
+         blocks into "zones", where each zone is a power of two number of
+         pages.  This option selects the largest power of two that the kernel
+         keeps in the memory allocator.  If you need to allocate very large
+         blocks of physically contiguous memory, then you may need to
+         increase this value.
+
+         This config option is actually maximum order plus one. For example,
+         a value of 11 means that the largest free memory block is 2^10 pages.
+
 source "drivers/pcmcia/Kconfig"
 
 source "drivers/pci/hotplug/Kconfig"
@@ -400,7 +423,7 @@ config DEFAULT_MEM_START
        hex "Physical address of the default memory area start"
        depends on PLATFORM_WANT_DEFAULT_MEM
        default 0x00000000 if MMU
-       default 0x40000000 if !MMU
+       default 0x60000000 if !MMU
        help
          This is a fallback start address of the default memory area, it is
          used when no physical memory size is passed through DTB or through