Merge tag 'stable/for-linus-3.18-rc0-tag' of git://git.kernel.org/pub/scm/linux/kerne...

[linux-2.6-block.git] / arch / arm64 / Kconfig

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 82bd86c445409ce857b30fc6f49eb8d8a5db7634..ac9afde76dead843ed4a53b2e0da97e4a7a0bd72 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -18,6 +18,7 @@ config ARM64
        select COMMON_CLK
        select CPU_PM if (SUSPEND || CPU_IDLE)
        select DCACHE_WORD_ACCESS
+       select GENERIC_ALLOCATOR
        select GENERIC_CLOCKEVENTS
        select GENERIC_CLOCKEVENTS_BROADCAST if SMP
        select GENERIC_CPU_AUTOPROBE
@@ -30,11 +31,13 @@ config ARM64
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
        select GENERIC_TIME_VSYSCALL
+       select HANDLE_DOMAIN_IRQ
        select HARDIRQS_SW_RESEND
        select HAVE_ARCH_AUDITSYSCALL
        select HAVE_ARCH_JUMP_LABEL
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_TRACEHOOK
+       select HAVE_BPF_JIT
        select HAVE_C_RECORDMCOUNT
        select HAVE_CC_STACKPROTECTOR
        select HAVE_DEBUG_BUGVERBOSE
@@ -54,6 +57,7 @@ config ARM64
        select HAVE_PERF_EVENTS
        select HAVE_PERF_REGS
        select HAVE_PERF_USER_STACK_DUMP
+       select HAVE_RCU_TABLE_FREE
        select HAVE_SYSCALL_TRACEPOINTS
        select IRQ_DOMAIN
        select MODULES_USE_ELF_RELA
@@ -81,7 +85,7 @@ config MMU
        def_bool y
 
 config NO_IOPORT_MAP
-       def_bool y
+       def_bool y if !PCI
 
 config STACKTRACE_SUPPORT
        def_bool y
@@ -107,6 +111,9 @@ config GENERIC_CALIBRATE_DELAY
 config ZONE_DMA
        def_bool y
 
+config HAVE_GENERIC_RCU_GUP
+       def_bool y
+
 config ARCH_DMA_ADDR_T_64BIT
        def_bool y
 
@@ -134,6 +141,11 @@ source "kernel/Kconfig.freezer"
 
 menu "Platform selection"
 
+config ARCH_THUNDER
+       bool "Cavium Inc. Thunder SoC Family"
+       help
+         This enables support for Cavium's Thunder Family of SoCs.
+
 config ARCH_VEXPRESS
        bool "ARMv8 software model (Versatile Express)"
        select ARCH_REQUIRE_GPIOLIB
@@ -156,6 +168,26 @@ menu "Bus support"
 config ARM_AMBA
        bool
 
+config PCI
+       bool "PCI support"
+       help
+         This feature enables support for PCI bus system. If you say Y
+         here, the kernel will include drivers and infrastructure code
+         to support PCI bus devices.
+
+config PCI_DOMAINS
+       def_bool PCI
+
+config PCI_DOMAINS_GENERIC
+       def_bool PCI
+
+config PCI_SYSCALL
+       def_bool PCI
+
+source "drivers/pci/Kconfig"
+source "drivers/pci/pcie/Kconfig"
+source "drivers/pci/hotplug/Kconfig"
+
 endmenu
 
 menu "Kernel Features"
@@ -252,11 +284,11 @@ config SCHED_SMT
          places. If unsure say N here.
 
 config NR_CPUS
-       int "Maximum number of CPUs (2-32)"
-       range 2 32
+       int "Maximum number of CPUs (2-64)"
+       range 2 64
        depends on SMP
        # These have to remain sorted largest to smallest
-       default "8"
+       default "64"
 
 config HOTPLUG_CPU
        bool "Support for hot-pluggable CPUs"