Merge tag 'mips_5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

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

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index b9c48b27162dc111aa6fee50d057f2cc4bee368d..ff8cff9fcf545bba8d9026aced13af4a804da07a 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -44,8 +44,7 @@ config MIPS
        select HAVE_ARCH_SECCOMP_FILTER
        select HAVE_ARCH_TRACEHOOK
        select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT
-       select HAVE_CBPF_JIT if (!64BIT && !CPU_MICROMIPS)
-       select HAVE_EBPF_JIT if (64BIT && !CPU_MICROMIPS)
+       select HAVE_EBPF_JIT if (!CPU_MICROMIPS)
        select HAVE_CONTEXT_TRACKING
        select HAVE_COPY_THREAD_TLS
        select HAVE_C_RECORDMCOUNT
@@ -276,7 +275,7 @@ config BCM47XX
        select BCM47XX_SPROM
        select BCM47XX_SSB if !BCM47XX_BCMA
        help
-        Support for BCM47XX based boards
+         Support for BCM47XX based boards
 
 config BCM63XX
        bool "Broadcom BCM63XX based boards"
@@ -295,7 +294,7 @@ config BCM63XX
        select MIPS_L1_CACHE_SHIFT_4
        select CLKDEV_LOOKUP
        help
-        Support for BCM63XX based boards
+         Support for BCM63XX based boards
 
 config MIPS_COBALT
        bool "Cobalt Server"
@@ -374,10 +373,10 @@ config MACH_JAZZ
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_100HZ
        help
-        This a family of machines based on the MIPS R4030 chipset which was
-        used by several vendors to build RISC/os and Windows NT workstations.
-        Members include the Acer PICA, MIPS Magnum 4000, MIPS Millennium and
-        Olivetti M700-10 workstations.
+         This a family of machines based on the MIPS R4030 chipset which was
+         used by several vendors to build RISC/os and Windows NT workstations.
+         Members include the Acer PICA, MIPS Magnum 4000, MIPS Millennium and
+         Olivetti M700-10 workstations.
 
 config MACH_INGENIC
        bool "Ingenic SoC based machines"
@@ -573,14 +572,14 @@ config NXP_STB220
        bool "NXP STB220 board"
        select SOC_PNX833X
        help
-        Support for NXP Semiconductors STB220 Development Board.
+         Support for NXP Semiconductors STB220 Development Board.
 
 config NXP_STB225
        bool "NXP 225 board"
        select SOC_PNX833X
        select SOC_PNX8335
        help
-        Support for NXP Semiconductors STB225 Development Board.
+         Support for NXP Semiconductors STB225 Development Board.
 
 config PMC_MSP
        bool "PMC-Sierra MSP chipsets"
@@ -722,9 +721,9 @@ config SGI_IP28
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select MIPS_L1_CACHE_SHIFT_7
-      help
-        This is the SGI Indigo2 with R10000 processor.  To compile a Linux
-        kernel that runs on these, say Y here.
+       help
+         This is the SGI Indigo2 with R10000 processor.  To compile a Linux
+         kernel that runs on these, say Y here.
 
 config SGI_IP32
        bool "SGI IP32 (O2)"
@@ -1168,9 +1167,9 @@ config HOLES_IN_ZONE
 config SYS_SUPPORTS_RELOCATABLE
        bool
        help
-        Selected if the platform supports relocating the kernel.
-        The platform must provide plat_get_fdt() if it selects CONFIG_USE_OF
-        to allow access to command line and entropy sources.
+         Selected if the platform supports relocating the kernel.
+         The platform must provide plat_get_fdt() if it selects CONFIG_USE_OF
+         to allow access to command line and entropy sources.
 
 config MIPS_CBPF_JIT
        def_bool y
@@ -2113,8 +2112,8 @@ config MIPS_PGD_C0_CONTEXT
 # Set to y for ptrace access to watch registers.
 #
 config HARDWARE_WATCHPOINTS
-       bool
-       default y if CPU_MIPSR1 || CPU_MIPSR2 || CPU_MIPSR6
+       bool
+       default y if CPU_MIPSR1 || CPU_MIPSR2 || CPU_MIPSR6
 
 menu "Kernel type"
 
@@ -2178,10 +2177,10 @@ config PAGE_SIZE_4KB
        bool "4kB"
        depends on !CPU_LOONGSON2 && !CPU_LOONGSON3
        help
-        This option select the standard 4kB Linux page size.  On some
-        R3000-family processors this is the only available page size.  Using
-        4kB page size will minimize memory consumption and is therefore
-        recommended for low memory systems.
+         This option select the standard 4kB Linux page size.  On some
+         R3000-family processors this is the only available page size.  Using
+         4kB page size will minimize memory consumption and is therefore
+         recommended for low memory systems.
 
 config PAGE_SIZE_8KB
        bool "8kB"
@@ -2474,7 +2473,6 @@ config SB1_PASS_2_1_WORKAROUNDS
        depends on CPU_SB1 && CPU_SB1_PASS_2
        default y
 
-
 choice
        prompt "SmartMIPS or microMIPS ASE support"
 
@@ -2682,16 +2680,16 @@ config RANDOMIZE_BASE
        bool "Randomize the address of the kernel image"
        depends on RELOCATABLE
        ---help---
-          Randomizes the physical and virtual address at which the
-          kernel image is loaded, as a security feature that
-          deters exploit attempts relying on knowledge of the location
-          of kernel internals.
+         Randomizes the physical and virtual address at which the
+         kernel image is loaded, as a security feature that
+         deters exploit attempts relying on knowledge of the location
+         of kernel internals.
 
-          Entropy is generated using any coprocessor 0 registers available.
+         Entropy is generated using any coprocessor 0 registers available.
 
-          The kernel will be offset by up to RANDOMIZE_BASE_MAX_OFFSET.
+         The kernel will be offset by up to RANDOMIZE_BASE_MAX_OFFSET.
 
-          If unsure, say N.
+         If unsure, say N.
 
 config RANDOMIZE_BASE_MAX_OFFSET
        hex "Maximum kASLR offset" if EXPERT
@@ -2821,7 +2819,7 @@ choice
        prompt "Timer frequency"
        default HZ_250
        help
-        Allows the configuration of the timer frequency.
+         Allows the configuration of the timer frequency.
 
        config HZ_24
                bool "24 HZ" if SYS_SUPPORTS_24HZ || SYS_SUPPORTS_ARBIT_HZ
@@ -3121,10 +3119,10 @@ config ARCH_MMAP_RND_BITS_MAX
        default 15
 
 config ARCH_MMAP_RND_COMPAT_BITS_MIN
-       default 8
+       default 8
 
 config ARCH_MMAP_RND_COMPAT_BITS_MAX
-       default 15
+       default 15
 
 config I8253
        bool