diff options
| author |   Marc Zyngier <marc.zyngier@arm.com> | 2016-01-06 09:32:23 +0000 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2016-02-29 18:34:15 +0000 |
| commit | fa85e25dad0f3f4e7ff2c58a914dcfe53210f680 (patch) | |
| tree | 79069cc2321f21d3cbe92a4e4aed6685df92acfb /arch/arm/kvm | |
| parent | ARM: KVM: Switch to C-based stage2 init (diff) | |
| download | linux-dev-fa85e25dad0f3f4e7ff2c58a914dcfe53210f680.tar.xz linux-dev-fa85e25dad0f3f4e7ff2c58a914dcfe53210f680.zip | |
ARM: KVM: Remove __weak attributes
Now that the old code is long gone, we can remove all the weak
attributes, as there is only one version of the code.
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/kvm')
| -rw-r--r-- | arch/arm/kvm/hyp/hyp-entry.S | 4 | ||||
| -rw-r--r-- | arch/arm/kvm/hyp/switch.c | 2 | ||||
| -rw-r--r-- | arch/arm/kvm/hyp/tlb.c | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/kvm/hyp/hyp-entry.S b/arch/arm/kvm/hyp/hyp-entry.S index 54a8d67ad980..78091383a5d9 100644 --- a/arch/arm/kvm/hyp/hyp-entry.S +++ b/arch/arm/kvm/hyp/hyp-entry.S @@ -58,10 +58,8 @@ */ .align 5 -__hyp_vector: - .global __hyp_vector __kvm_hyp_vector: - .weak __kvm_hyp_vector + .global __kvm_hyp_vector @ Hyp-mode exception vector W(b) hyp_reset diff --git a/arch/arm/kvm/hyp/switch.c b/arch/arm/kvm/hyp/switch.c index abbe90b5f2ff..f11ede159080 100644 --- a/arch/arm/kvm/hyp/switch.c +++ b/arch/arm/kvm/hyp/switch.c @@ -191,7 +191,7 @@ again: return exit_code; } -__alias(__guest_run) int __weak __kvm_vcpu_run(struct kvm_vcpu *vcpu); +__alias(__guest_run) int __kvm_vcpu_run(struct kvm_vcpu *vcpu); static const char * const __hyp_panic_string[] = { [ARM_EXCEPTION_RESET] = "\nHYP panic: RST PC:%08x CPSR:%08x", diff --git a/arch/arm/kvm/hyp/tlb.c b/arch/arm/kvm/hyp/tlb.c index aaa44bbac766..82958b8f6a74 100644 --- a/arch/arm/kvm/hyp/tlb.c +++ b/arch/arm/kvm/hyp/tlb.c @@ -50,14 +50,14 @@ static void __hyp_text __tlb_flush_vmid(struct kvm *kvm) write_sysreg(0, VTTBR); } -__alias(__tlb_flush_vmid) void __weak __kvm_tlb_flush_vmid(struct kvm *kvm); +__alias(__tlb_flush_vmid) void __kvm_tlb_flush_vmid(struct kvm *kvm); static void __hyp_text __tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa) { __tlb_flush_vmid(kvm); } -__alias(__tlb_flush_vmid_ipa) void __weak __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, +__alias(__tlb_flush_vmid_ipa) void __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa); static void __hyp_text __tlb_flush_vm_context(void) @@ -67,4 +67,4 @@ static void __hyp_text __tlb_flush_vm_context(void) dsb(ish); } -__alias(__tlb_flush_vm_context) void __weak __kvm_flush_vm_context(void); +__alias(__tlb_flush_vm_context) void __kvm_flush_vm_context(void); |