leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: KVM: Remove __weak attributes

Browse Source 
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>
This commit is contained in:
Marc Zyngier 2016-01-06 09:32:23 +00:00
parent d4c7688c51
commit fa85e25dad
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/kvm/hyp/hyp-entry.S
View File

@ -58,10 +58,8 @@
*/ */
.align 5 .align 5
__hyp_vector:
.global __hyp_vector
__kvm_hyp_vector: __kvm_hyp_vector:
.weak __kvm_hyp_vector .global __kvm_hyp_vector
@ Hyp-mode exception vector @ Hyp-mode exception vector
W(b) hyp_reset W(b) hyp_reset

2
arch/arm/kvm/hyp/switch.c
View File

@ -191,7 +191,7 @@ again:
return exit_code; 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[] = { static const char * const __hyp_panic_string[] = {
[ARM_EXCEPTION_RESET] = "\nHYP panic: RST PC:%08x CPSR:%08x", [ARM_EXCEPTION_RESET] = "\nHYP panic: RST PC:%08x CPSR:%08x",

6
arch/arm/kvm/hyp/tlb.c
View File

@ -50,14 +50,14 @@ static void __hyp_text __tlb_flush_vmid(struct kvm *kvm)
write_sysreg(0, VTTBR); 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) static void __hyp_text __tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa)
{ {
__tlb_flush_vmid(kvm); __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); phys_addr_t ipa);
static void __hyp_text __tlb_flush_vm_context(void) static void __hyp_text __tlb_flush_vm_context(void)
@ -67,4 +67,4 @@ static void __hyp_text __tlb_flush_vm_context(void)
dsb(ish); 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);