diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-11-16 05:31:17 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-11-16 05:31:17 -0500 |
| commit | f108c898ddae4bb1146ed9e46ce4470725d945c4 (patch) | |
| tree | bb887907e0448d4d903f853c33b3c55a863412e2 /arch/arm64/Kconfig | |
| parent | 904cb3677f3adcd3d837be0a0d0b14251ba8d6f7 (diff) | |
| parent | 68055915c1c22489f9658bd2b7391bb11b2cf4e4 (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/Kconfig')
| -rw-r--r-- | arch/arm64/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index ac9afde76dea..9532f8d5857e 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | config ARM64 | 1 | config ARM64 |
| 2 | def_bool y | 2 | def_bool y |
| 3 | select ARCH_BINFMT_ELF_RANDOMIZE_PIE | ||
| 3 | select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE | 4 | select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE |
| 4 | select ARCH_HAS_SG_CHAIN | 5 | select ARCH_HAS_SG_CHAIN |
| 5 | select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST | 6 | select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST |
| @@ -232,7 +233,7 @@ config ARM64_VA_BITS_42 | |||
| 232 | 233 | ||
| 233 | config ARM64_VA_BITS_48 | 234 | config ARM64_VA_BITS_48 |
| 234 | bool "48-bit" | 235 | bool "48-bit" |
| 235 | depends on BROKEN | 236 | depends on !ARM_SMMU |
| 236 | 237 | ||
| 237 | endchoice | 238 | endchoice |
| 238 | 239 | ||