Merge tag 'kvm-arm-for-4.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git...

KVM/ARM Fixes for v4.6-rc4

Addresses:
 - Wrong indentation in the PMU code from the merge window
 - A long-time bug occuring with running ntpd on the host, candidate for stable
 - Properly handle (and warn about) the unsupported configuration of running on
   systems with less than 40 bits of PA space
 - More fixes to the PM and hotplug notifier stuff from the merge window

diff --combined arch/arm64/include/asm/kvm_host.h
index b7e82a795ac9e087098c957b42e717c0fad0985c,4cd4196e94a9b8f32158cee453f991424ea53e82..f5c6bd2541ef4d16c6f3b26cee01cc013d50055d
--- 1/arch/arm64/include/asm/kvm_host.h
--- 2/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@@ -27,6 -27,7 +27,6 @@@
  #include <asm/kvm.h>
  #include <asm/kvm_asm.h>
  #include <asm/kvm_mmio.h>
 -#include <asm/kvm_perf_event.h>
  
  #define __KVM_HAVE_ARCH_INTC_INITIALIZED
  
@@@ -369,11 -370,12 +369,12 @@@ int kvm_arm_vcpu_arch_get_attr(struct k
  int kvm_arm_vcpu_arch_has_attr(struct kvm_vcpu *vcpu,
                               struct kvm_device_attr *attr);
  
- /* #define kvm_call_hyp(f, ...) __kvm_call_hyp(kvm_ksym_ref(f), ##__VA_ARGS__) */
- 
  static inline void __cpu_init_stage2(void)
  {
-       kvm_call_hyp(__init_stage2_translation);
+       u32 parange = kvm_call_hyp(__init_stage2_translation);
+ 
+       WARN_ONCE(parange < 40,
+                 "PARange is %d bits, unsupported configuration!", parange);
  }
  
  #endif /* __ARM64_KVM_HOST_H__ */