diff options
Diffstat (limited to 'arch/powerpc/kvm/powerpc.c')
-rw-r--r-- | arch/powerpc/kvm/powerpc.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index c1f8f53cd312..c45eaab752b0 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c | |||
@@ -527,18 +527,12 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) | |||
527 | r = 0; | 527 | r = 0; |
528 | break; | 528 | break; |
529 | case KVM_CAP_PPC_RMA: | 529 | case KVM_CAP_PPC_RMA: |
530 | r = hv_enabled; | 530 | r = 0; |
531 | /* PPC970 requires an RMA */ | ||
532 | if (r && cpu_has_feature(CPU_FTR_ARCH_201)) | ||
533 | r = 2; | ||
534 | break; | 531 | break; |
535 | #endif | 532 | #endif |
536 | case KVM_CAP_SYNC_MMU: | 533 | case KVM_CAP_SYNC_MMU: |
537 | #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE | 534 | #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE |
538 | if (hv_enabled) | 535 | r = hv_enabled; |
539 | r = cpu_has_feature(CPU_FTR_ARCH_206) ? 1 : 0; | ||
540 | else | ||
541 | r = 0; | ||
542 | #elif defined(KVM_ARCH_WANT_MMU_NOTIFIER) | 536 | #elif defined(KVM_ARCH_WANT_MMU_NOTIFIER) |
543 | r = 1; | 537 | r = 1; |
544 | #else | 538 | #else |