diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-07-03 10:20:22 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-07-03 10:20:22 +0300 |
commit | 4520843dfa34417eb1e2061f60d2345d9ca614e1 (patch) | |
tree | 7b983b8cf20c6154cf897000610c5b7c754e26d9 /virt/kvm/Kconfig | |
parent | 03585a95cd830e7a92697d2a8fe9a34df87563db (diff) | |
parent | 1cef1150ef40ec52f507436a14230cbc2623299c (diff) | |
download | linux-4520843dfa34417eb1e2061f60d2345d9ca614e1.tar.xz |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'virt/kvm/Kconfig')
-rw-r--r-- | virt/kvm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/Kconfig b/virt/kvm/Kconfig index 72143cfaf6ec..ea434ddc8499 100644 --- a/virt/kvm/Kconfig +++ b/virt/kvm/Kconfig @@ -47,7 +47,7 @@ config KVM_GENERIC_DIRTYLOG_READ_PROTECT config KVM_COMPAT def_bool y - depends on KVM && COMPAT && !S390 + depends on KVM && COMPAT && !(S390 || ARM64) config HAVE_KVM_IRQ_BYPASS bool |