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/arm/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/arm/kvm/hyp/switch.c')
-rw-r--r-- | arch/arm/kvm/hyp/switch.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/kvm/hyp/switch.c b/arch/arm/kvm/hyp/switch.c index b13caa90cd44..37b336549700 100644 --- a/arch/arm/kvm/hyp/switch.c +++ b/arch/arm/kvm/hyp/switch.c | |||
@@ -134,7 +134,7 @@ static bool __hyp_text __populate_fault_info(struct kvm_vcpu *vcpu) | |||
134 | return true; | 134 | return true; |
135 | } | 135 | } |
136 | 136 | ||
137 | static int __hyp_text __guest_run(struct kvm_vcpu *vcpu) | 137 | int __hyp_text __kvm_vcpu_run(struct kvm_vcpu *vcpu) |
138 | { | 138 | { |
139 | struct kvm_cpu_context *host_ctxt; | 139 | struct kvm_cpu_context *host_ctxt; |
140 | struct kvm_cpu_context *guest_ctxt; | 140 | struct kvm_cpu_context *guest_ctxt; |
@@ -191,8 +191,6 @@ again: | |||
191 | return exit_code; | 191 | return exit_code; |
192 | } | 192 | } |
193 | 193 | ||
194 | __alias(__guest_run) int __kvm_vcpu_run(struct kvm_vcpu *vcpu); | ||
195 | |||
196 | static const char * const __hyp_panic_string[] = { | 194 | static const char * const __hyp_panic_string[] = { |
197 | [ARM_EXCEPTION_RESET] = "\nHYP panic: RST PC:%08x CPSR:%08x", | 195 | [ARM_EXCEPTION_RESET] = "\nHYP panic: RST PC:%08x CPSR:%08x", |
198 | [ARM_EXCEPTION_UNDEFINED] = "\nHYP panic: UNDEF PC:%08x CPSR:%08x", | 196 | [ARM_EXCEPTION_UNDEFINED] = "\nHYP panic: UNDEF PC:%08x CPSR:%08x", |