Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa85e25d authored by Marc Zyngier's avatar Marc Zyngier
Browse files

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: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent d4c7688c

arch/arm/kvm/hyp/hyp-entry.S

+1 −3
Original line number Diff line number Diff line
@@ -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

arch/arm/kvm/hyp/switch.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static int __hyp_text __guest_run(struct kvm_vcpu *vcpu) 
	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",

arch/arm/kvm/hyp/tlb.c

+3 −3
Original line number Diff line number Diff line
@@ -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);