diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2015-10-25 13:58:00 +0000 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2015-12-14 11:30:42 +0000 |
| commit | 044ac37d1281fc7b59d5dce4fe979a99369e95f2 (patch) | |
| tree | dfe0f4cfd2860af11ac6825ba16b082e87a6031e /arch/arm64/kvm/hyp/switch.c | |
| parent | 53fd5b6487e4438049a5da5e36dfb8edcf1fd789 (diff) | |
| download | op-kernel-dev-044ac37d1281fc7b59d5dce4fe979a99369e95f2.zip op-kernel-dev-044ac37d1281fc7b59d5dce4fe979a99369e95f2.tar.gz | |
arm64: KVM: Add compatibility aliases
So far, we've implemented the new world switch with a completely
different namespace, so that we could have both implementation
compiled in.
Let's take things one step further by adding weak aliases that
have the same names as the original implementation. The weak
attributes allows the new implementation to be overriden by the
old one, and everything still work.
At a later point, we'll be able to simply drop the old code, and
everything will hopefully keep working, thanks to the aliases we
have just added. This also saves us repainting all the callers.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Diffstat (limited to 'arch/arm64/kvm/hyp/switch.c')
| -rw-r--r-- | arch/arm64/kvm/hyp/switch.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c index b012870..7457ae4 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c @@ -142,6 +142,9 @@ int __hyp_text __guest_run(struct kvm_vcpu *vcpu) return exit_code; } +__alias(__guest_run) +int __weak __kvm_vcpu_run(struct kvm_vcpu *vcpu); + static const char __hyp_panic_string[] = "HYP panic:\nPS:%08llx PC:%016llx ESR:%08llx\nFAR:%016llx HPFAR:%016llx PAR:%016llx\nVCPU:%p\n"; void __hyp_text __noreturn __hyp_panic(void) |
