diff options
author | Christoffer Dall <christoffer.dall@linaro.org> | 2016-09-01 07:16:03 -0400 |
---|---|---|
committer | Christoffer Dall <christoffer.dall@linaro.org> | 2016-09-08 06:53:00 -0400 |
commit | cf0ba18a441410aeaf3ef97eead3a3fa5381f46f (patch) | |
tree | ec64816a26f174b4de6bbb76c756fdfc02dd6cdf /arch/arm64/kvm/hyp/switch.c | |
parent | 777c155772f9a234d72b9319325d8b6abd0c0e36 (diff) |
KVM: arm/arm64: Get rid of exported aliases to static functions
When rewriting the assembly code to C code, it was useful to have
exported aliases or static functions so that we could keep the existing
common C code unmodified and at the same time rewrite arm64 from
assembly to C code, and later do the arm part.
Now when both are done, we really don't need this level of indirection
anymore, and it's time to save a few lines and brain cells.
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-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 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c index 5a84b4562603..35d2e09ac695 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c | |||
@@ -232,7 +232,7 @@ static bool __hyp_text __populate_fault_info(struct kvm_vcpu *vcpu) | |||
232 | return true; | 232 | return true; |
233 | } | 233 | } |
234 | 234 | ||
235 | static int __hyp_text __guest_run(struct kvm_vcpu *vcpu) | 235 | int __hyp_text __kvm_vcpu_run(struct kvm_vcpu *vcpu) |
236 | { | 236 | { |
237 | struct kvm_cpu_context *host_ctxt; | 237 | struct kvm_cpu_context *host_ctxt; |
238 | struct kvm_cpu_context *guest_ctxt; | 238 | struct kvm_cpu_context *guest_ctxt; |
@@ -293,8 +293,6 @@ again: | |||
293 | return exit_code; | 293 | return exit_code; |
294 | } | 294 | } |
295 | 295 | ||
296 | __alias(__guest_run) int __kvm_vcpu_run(struct kvm_vcpu *vcpu); | ||
297 | |||
298 | static const char __hyp_panic_string[] = "HYP panic:\nPS:%08llx PC:%016llx ESR:%08llx\nFAR:%016llx HPFAR:%016llx PAR:%016llx\nVCPU:%p\n"; | 296 | static const char __hyp_panic_string[] = "HYP panic:\nPS:%08llx PC:%016llx ESR:%08llx\nFAR:%016llx HPFAR:%016llx PAR:%016llx\nVCPU:%p\n"; |
299 | 297 | ||
300 | static void __hyp_text __hyp_call_panic_nvhe(u64 spsr, u64 elr, u64 par) | 298 | static void __hyp_text __hyp_call_panic_nvhe(u64 spsr, u64 elr, u64 par) |