From: Paolo Bonzini <pbonzini@redhat.com>
Date: Sat, 27 Sep 2014 09:03:33 +0000 (+0200)
Subject: Merge tag 'kvm-arm-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm... 
X-Git-Tag: v3.18-rc1~138^2~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e77d99d4a4ec761ad061f1ec890c71040a92efe3;p=~emulex%2Finfiniband.git

Merge tag 'kvm-arm-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-next

Changes for KVM for arm/arm64 for 3.18

This includes a bunch of changes:
 - Support read-only memory slots on arm/arm64
 - Various changes to fix Sparse warnings
 - Correctly detect write vs. read Stage-2 faults
 - Various VGIC cleanups and fixes
 - Dynamic VGIC data strcuture sizing
 - Fix SGI set_clear_pend offset bug
 - Fix VTTBR_BADDR Mask
 - Correctly report the FSC on Stage-2 faults

Conflicts:
	virt/kvm/eventfd.c
	[duplicate, different patch where the kvm-arm version broke x86.
	 The kvm tree instead has the right one]
---

e77d99d4a4ec761ad061f1ec890c71040a92efe3
diff --cc arch/arm64/include/asm/kvm_host.h
index 992d9da8811,bcde4190574..2012c4ba8d6
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@@ -191,13 -190,8 +191,13 @@@ static inline int kvm_test_age_hva(stru
  	return 0;
  }
  
 +static inline void kvm_arch_mmu_notifier_invalidate_page(struct kvm *kvm,
 +							 unsigned long address)
 +{
 +}
 +
  struct kvm_vcpu *kvm_arm_get_running_vcpu(void);
- struct kvm_vcpu __percpu **kvm_get_running_vcpus(void);
+ struct kvm_vcpu * __percpu *kvm_get_running_vcpus(void);
  
  u64 kvm_call_hyp(void *hypfn, ...);