Merge tag 'usercopy-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

[deliverable/linux.git] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 9f694311c9ede7591ec0bbda944bc685590ca1de..0e348781327b2dcc9667b38344fb98e8c4936dcc 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -72,6 +72,7 @@ config S390
        select ARCH_HAS_DEVMEM_IS_ALLOWED
        select ARCH_HAS_ELF_RANDOMIZE
        select ARCH_HAS_GCOV_PROFILE_ALL
+       select ARCH_HAS_KCOV
        select ARCH_HAS_SG_CHAIN
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select ARCH_INLINE_READ_LOCK
@@ -164,6 +165,7 @@ config S390
        select NO_BOOTMEM
        select OLD_SIGACTION
        select OLD_SIGSUSPEND3
+       select SPARSE_IRQ
        select SYSCTL_EXCEPTION_TRACE
        select TTY
        select VIRT_CPU_ACCOUNTING
@@ -478,6 +480,9 @@ config SCHED_MC
 config SCHED_BOOK
        def_bool n
 
+config SCHED_DRAWER
+       def_bool n
+
 config SCHED_TOPOLOGY
        def_bool y
        prompt "Topology scheduler support"
@@ -485,6 +490,7 @@ config SCHED_TOPOLOGY
        select SCHED_SMT
        select SCHED_MC
        select SCHED_BOOK
+       select SCHED_DRAWER
        help
          Topology scheduler support improves the CPU scheduler's decision
          making when dealing with machines that have multi-threading,
@@ -606,16 +612,6 @@ config PCI_NR_FUNCTIONS
          This allows you to specify the maximum number of PCI functions which
          this kernel will support.
 
-config PCI_NR_MSI
-       int "Maximum number of MSI interrupts (64-32768)"
-       range 64 32768
-       default "256"
-       help
-         This defines the number of virtual interrupts the kernel will
-         provide for MSI interrupts. If you configure your system to have
-         too few drivers will fail to allocate MSI interrupts for all
-         PCI devices.
-
 source "drivers/pci/Kconfig"
 
 endif  # PCI