diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-22 17:26:27 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-23 04:31:10 -0400 |
| commit | 51aaf81fae8bf89b6bd277a244b5b43db9c730a0 (patch) | |
| tree | ded72183d3c05be4bbef3fbebc6138fc5e645245 | |
| parent | e3892e9160a6ae40abc45192df30f3e31b6dd0ff (diff) | |
ARM: keep arch/arm/Kconfig and arch/arm/mm/Kconfig select entries sorted
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/Kconfig | 10 | ||||
| -rw-r--r-- | arch/arm/mm/Kconfig | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ab438cb5af55..53e99eb543d9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -30,9 +30,9 @@ config ARM | |||
| 30 | select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT) | 30 | select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT) |
| 31 | select HAVE_ARCH_TRACEHOOK | 31 | select HAVE_ARCH_TRACEHOOK |
| 32 | select HAVE_BPF_JIT | 32 | select HAVE_BPF_JIT |
| 33 | select HAVE_CC_STACKPROTECTOR | ||
| 33 | select HAVE_CONTEXT_TRACKING | 34 | select HAVE_CONTEXT_TRACKING |
| 34 | select HAVE_C_RECORDMCOUNT | 35 | select HAVE_C_RECORDMCOUNT |
| 35 | select HAVE_CC_STACKPROTECTOR | ||
| 36 | select HAVE_DEBUG_KMEMLEAK | 36 | select HAVE_DEBUG_KMEMLEAK |
| 37 | select HAVE_DMA_API_DEBUG | 37 | select HAVE_DMA_API_DEBUG |
| 38 | select HAVE_DMA_ATTRS | 38 | select HAVE_DMA_ATTRS |
| @@ -422,8 +422,8 @@ config ARCH_EFM32 | |||
| 422 | bool "Energy Micro efm32" | 422 | bool "Energy Micro efm32" |
| 423 | depends on !MMU | 423 | depends on !MMU |
| 424 | select ARCH_REQUIRE_GPIOLIB | 424 | select ARCH_REQUIRE_GPIOLIB |
| 425 | select AUTO_ZRELADDR | ||
| 426 | select ARM_NVIC | 425 | select ARM_NVIC |
| 426 | select AUTO_ZRELADDR | ||
| 427 | select CLKSRC_OF | 427 | select CLKSRC_OF |
| 428 | select COMMON_CLK | 428 | select COMMON_CLK |
| 429 | select CPU_V7M | 429 | select CPU_V7M |
| @@ -511,8 +511,8 @@ config ARCH_IXP4XX | |||
| 511 | bool "IXP4xx-based" | 511 | bool "IXP4xx-based" |
| 512 | depends on MMU | 512 | depends on MMU |
| 513 | select ARCH_HAS_DMA_SET_COHERENT_MASK | 513 | select ARCH_HAS_DMA_SET_COHERENT_MASK |
| 514 | select ARCH_SUPPORTS_BIG_ENDIAN | ||
| 515 | select ARCH_REQUIRE_GPIOLIB | 514 | select ARCH_REQUIRE_GPIOLIB |
| 515 | select ARCH_SUPPORTS_BIG_ENDIAN | ||
| 516 | select CLKSRC_MMIO | 516 | select CLKSRC_MMIO |
| 517 | select CPU_XSCALE | 517 | select CPU_XSCALE |
| 518 | select DMABOUNCE if PCI | 518 | select DMABOUNCE if PCI |
| @@ -1575,8 +1575,8 @@ config BIG_LITTLE | |||
| 1575 | config BL_SWITCHER | 1575 | config BL_SWITCHER |
| 1576 | bool "big.LITTLE switcher support" | 1576 | bool "big.LITTLE switcher support" |
| 1577 | depends on BIG_LITTLE && MCPM && HOTPLUG_CPU | 1577 | depends on BIG_LITTLE && MCPM && HOTPLUG_CPU |
| 1578 | select CPU_PM | ||
| 1579 | select ARM_CPU_SUSPEND | 1578 | select ARM_CPU_SUSPEND |
| 1579 | select CPU_PM | ||
| 1580 | help | 1580 | help |
| 1581 | The big.LITTLE "switcher" provides the core functionality to | 1581 | The big.LITTLE "switcher" provides the core functionality to |
| 1582 | transparently handle transition between a cluster of A15's | 1582 | transparently handle transition between a cluster of A15's |
| @@ -1920,9 +1920,9 @@ config XEN | |||
| 1920 | depends on CPU_V7 && !CPU_V6 | 1920 | depends on CPU_V7 && !CPU_V6 |
| 1921 | depends on !GENERIC_ATOMIC64 | 1921 | depends on !GENERIC_ATOMIC64 |
| 1922 | depends on MMU | 1922 | depends on MMU |
| 1923 | select ARCH_DMA_ADDR_T_64BIT | ||
| 1923 | select ARM_PSCI | 1924 | select ARM_PSCI |
| 1924 | select SWIOTLB_XEN | 1925 | select SWIOTLB_XEN |
| 1925 | select ARCH_DMA_ADDR_T_64BIT | ||
| 1926 | help | 1926 | help |
| 1927 | Say Y if you want to run Linux in a Virtual Machine on Xen on ARM. | 1927 | Say Y if you want to run Linux in a Virtual Machine on Xen on ARM. |
| 1928 | 1928 | ||
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index f5ad9ee70426..5bf7c3c3b301 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
| @@ -420,29 +420,29 @@ config CPU_32v3 | |||
| 420 | bool | 420 | bool |
| 421 | select CPU_USE_DOMAINS if MMU | 421 | select CPU_USE_DOMAINS if MMU |
| 422 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP | 422 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP |
| 423 | select TLS_REG_EMUL if SMP || !MMU | ||
| 424 | select NEED_KUSER_HELPERS | 423 | select NEED_KUSER_HELPERS |
| 424 | select TLS_REG_EMUL if SMP || !MMU | ||
| 425 | 425 | ||
| 426 | config CPU_32v4 | 426 | config CPU_32v4 |
| 427 | bool | 427 | bool |
| 428 | select CPU_USE_DOMAINS if MMU | 428 | select CPU_USE_DOMAINS if MMU |
| 429 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP | 429 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP |
| 430 | select TLS_REG_EMUL if SMP || !MMU | ||
| 431 | select NEED_KUSER_HELPERS | 430 | select NEED_KUSER_HELPERS |
| 431 | select TLS_REG_EMUL if SMP || !MMU | ||
| 432 | 432 | ||
| 433 | config CPU_32v4T | 433 | config CPU_32v4T |
| 434 | bool | 434 | bool |
| 435 | select CPU_USE_DOMAINS if MMU | 435 | select CPU_USE_DOMAINS if MMU |
| 436 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP | 436 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP |
| 437 | select TLS_REG_EMUL if SMP || !MMU | ||
| 438 | select NEED_KUSER_HELPERS | 437 | select NEED_KUSER_HELPERS |
| 438 | select TLS_REG_EMUL if SMP || !MMU | ||
| 439 | 439 | ||
| 440 | config CPU_32v5 | 440 | config CPU_32v5 |
| 441 | bool | 441 | bool |
| 442 | select CPU_USE_DOMAINS if MMU | 442 | select CPU_USE_DOMAINS if MMU |
| 443 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP | 443 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP |
| 444 | select TLS_REG_EMUL if SMP || !MMU | ||
| 445 | select NEED_KUSER_HELPERS | 444 | select NEED_KUSER_HELPERS |
| 445 | select TLS_REG_EMUL if SMP || !MMU | ||
| 446 | 446 | ||
| 447 | config CPU_32v6 | 447 | config CPU_32v6 |
| 448 | bool | 448 | bool |
