Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into HEAD

Patch queue for ppc - 2014-12-18

Highights this time around:

  - Removal of HV support for 970. It became a maintenance burden and received
    practically no testing. POWER8 with HV is available now, so just grab one
    of those boxes if PR isn't enough for you.
  - Some bug fixes and performance improvements
  - Tracepoints for book3s_hv

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)
                         r = 0;
                 break;
         case KVM_CAP_PPC_RMA:
-                r = hv_enabled;
-                /* PPC970 requires an RMA */
-                if (r && cpu_has_feature(CPU_FTR_ARCH_201))
-                        r = 2;
+                r = 0;
                 break;
 #endif
         case KVM_CAP_SYNC_MMU:
 #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
-                if (hv_enabled)
-                        r = cpu_has_feature(CPU_FTR_ARCH_206) ? 1 : 0;
-                else
-                        r = 0;
+                r = hv_enabled;
 #elif defined(KVM_ARCH_WANT_MMU_NOTIFIER)
                 r = 1;
 #else