bpf, x86_32: add eBPF JIT compiler for ia32

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

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 27fede43895957b762274f0205eaefbd5d86c131..1f5fa2f2c1684c6452b3357ada5997ec84d958fd 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -29,6 +29,7 @@ config X86_64
        select HAVE_ARCH_SOFT_DIRTY
        select MODULES_USE_ELF_RELA
        select X86_DEV_DMA_OPS
+       select ARCH_HAS_SYSCALL_WRAPPER
 
 #
 # Arch settings
@@ -136,7 +137,7 @@ config X86
        select HAVE_DMA_CONTIGUOUS
        select HAVE_DYNAMIC_FTRACE
        select HAVE_DYNAMIC_FTRACE_WITH_REGS
-       select HAVE_EBPF_JIT                    if X86_64
+       select HAVE_EBPF_JIT
        select HAVE_EFFICIENT_UNALIGNED_ACCESS
        select HAVE_EXIT_THREAD
        select HAVE_FENTRY                      if X86_64 || DYNAMIC_FTRACE
@@ -1296,7 +1297,7 @@ config MICROCODE
          the Linux kernel.
 
          The preferred method to load microcode from a detached initrd is described
-         in Documentation/x86/early-microcode.txt. For that you need to enable
+         in Documentation/x86/microcode.txt. For that you need to enable
          CONFIG_BLK_DEV_INITRD in order for the loader to be able to scan the
          initrd for microcode blobs.
 
@@ -2008,6 +2009,9 @@ config KEXEC_FILE
          for kernel and initramfs as opposed to list of segments as
          accepted by previous system call.
 
+config ARCH_HAS_KEXEC_PURGATORY
+       def_bool KEXEC_FILE
+
 config KEXEC_VERIFY_SIG
        bool "Verify kernel signature during kexec_file_load() syscall"
        depends on KEXEC_FILE
@@ -2665,11 +2669,13 @@ config PCI_CNB20LE_QUIRK
 source "drivers/pci/Kconfig"
 
 config ISA_BUS
-       bool "ISA-style bus support on modern systems" if EXPERT
-       select ISA_BUS_API
+       bool "ISA bus support on modern systems" if EXPERT
        help
-         Enables ISA-style drivers on modern systems. This is necessary to
-         support PC/104 devices on X86_64 platforms.
+         Expose ISA bus device drivers and options available for selection and
+         configuration. Enable this option if your target machine has an ISA
+         bus. ISA is an older system, displaced by PCI and newer bus
+         architectures -- if your target machine is modern, it probably does
+         not have an ISA bus.
 
          If unsure, say N.
 
@@ -2758,11 +2764,9 @@ config OLPC_XO1_RTC
 
 config OLPC_XO1_SCI
        bool "OLPC XO-1 SCI extras"
-       depends on OLPC && OLPC_XO1_PM
+       depends on OLPC && OLPC_XO1_PM && GPIO_CS5535=y
        depends on INPUT=y
        select POWER_SUPPLY
-       select GPIO_CS5535
-       select MFD_CORE
        ---help---
          Add support for SCI-based features of the OLPC XO-1 laptop:
           - EC-driven system wakeups