diff options
| author | Yang Shi <yang.shi@linaro.org> | 2016-04-18 20:16:14 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2016-04-20 13:16:50 +0200 |
| commit | 8ee708792e1ccda683ec9cce9fab3b25ece0eb60 (patch) | |
| tree | c1f718d93a0668850414e0d7e0888b23215c172f /arch/arm64/Kconfig | |
| parent | arm64: mm: Show bss segment in kernel memory layout (diff) | |
| download | linux-8ee708792e1ccda683ec9cce9fab3b25ece0eb60.tar.xz linux-8ee708792e1ccda683ec9cce9fab3b25ece0eb60.zip | |
arm64: Kconfig: remove redundant HAVE_ARCH_TRANSPARENT_HUGEPAGE definition
HAVE_ARCH_TRANSPARENT_HUGEPAGE has been defined in arch/Kconfig already,
the ARM64 version is identical with it and the default value is Y. So remove
the redundant definition and just select it under CONFIG_ARM64.
Signed-off-by: Yang Shi <yang.shi@linaro.org>
[will: sort into alphabetical order whilst I'm resolving conflicts]
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm64/Kconfig | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index a578080ae7a0..c8762f4613f0 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -59,11 +59,14 @@ config ARM64 select HAVE_ARCH_MMAP_RND_COMPAT_BITS if COMPAT select HAVE_ARCH_SECCOMP_FILTER select HAVE_ARCH_TRACEHOOK + select HAVE_ARCH_TRANSPARENT_HUGEPAGE + select HAVE_ARM_SMCCC select HAVE_BPF_JIT select HAVE_C_RECORDMCOUNT select HAVE_CC_STACKPROTECTOR select HAVE_CMPXCHG_DOUBLE select HAVE_CMPXCHG_LOCAL + select HAVE_CONTEXT_TRACKING select HAVE_DEBUG_BUGVERBOSE select HAVE_DEBUG_KMEMLEAK select HAVE_DMA_API_DEBUG @@ -91,6 +94,7 @@ config ARM64 select NO_BOOTMEM select OF select OF_EARLY_FLATTREE + select OF_NUMA if NUMA && OF select OF_RESERVED_MEM select PERF_USE_VMALLOC select POWER_RESET @@ -98,9 +102,6 @@ config ARM64 select RTC_LIB select SPARSE_IRQ select SYSCTL_EXCEPTION_TRACE - select HAVE_CONTEXT_TRACKING - select HAVE_ARM_SMCCC - select OF_NUMA if NUMA && OF help ARM 64-bit (AArch64) Linux support. @@ -605,9 +606,6 @@ config SYS_SUPPORTS_HUGETLBFS config ARCH_WANT_HUGE_PMD_SHARE def_bool y if ARM64_4K_PAGES || (ARM64_16K_PAGES && !ARM64_VA_BITS_36) -config HAVE_ARCH_TRANSPARENT_HUGEPAGE - def_bool y - config ARCH_HAS_CACHE_LINE_SIZE def_bool y |