Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
arch/arm64/include/asm/kvm_host.h
between commit:
a0bf9776cd0b ("arm64: kvm: deal with kernel symbols outside of linear mapping")
from the arm64 tree and commit:
67aaab4cff18 ("arm64: KVM: Move __cpu_init_stage2 after kvm_call_hyp")
from the kvm-arm tree.
This was an expected conflict (see the kvm-arm tree commit message.
I fixed it up (as expected - see below) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell
diff --cc arch/arm64/include/asm/kvm_host.h
index e3d67ff8798b,31fe7d6f32de..000000000000
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@@ -343,6 -344,11 +344,11 @@@ void kvm_arm_setup_debug(struct kvm_vcp
void kvm_arm_clear_debug(struct kvm_vcpu *vcpu);
void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu);
-/* #define kvm_call_hyp(f, ...) __kvm_call_hyp(kvm_ksym_ref(f), ##__VA_ARGS__) */
+#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);
+ }
+
#endif /* __ARM64_KVM_HOST_H__ */
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
