Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+5 -7
+1 -3
arch/arm/kvm/hyp/hyp-entry.S
··· 58 58 */ 59 59 60 60 .align 5 61 - __hyp_vector: 62 - .global __hyp_vector 63 61 __kvm_hyp_vector: 64 - .weak __kvm_hyp_vector 62 + .global __kvm_hyp_vector 65 63 66 64 @ Hyp-mode exception vector 67 65 W(b) hyp_reset
+1 -1
arch/arm/kvm/hyp/switch.c
··· 191 191 return exit_code; 192 192 } 193 193 194 - __alias(__guest_run) int __weak __kvm_vcpu_run(struct kvm_vcpu *vcpu); 194 + __alias(__guest_run) int __kvm_vcpu_run(struct kvm_vcpu *vcpu); 195 195 196 196 static const char * const __hyp_panic_string[] = { 197 197 [ARM_EXCEPTION_RESET] = "\nHYP panic: RST PC:%08x CPSR:%08x",
+3 -3
arch/arm/kvm/hyp/tlb.c
··· 50 50 write_sysreg(0, VTTBR); 51 51 } 52 52 53 - __alias(__tlb_flush_vmid) void __weak __kvm_tlb_flush_vmid(struct kvm *kvm); 53 + __alias(__tlb_flush_vmid) void __kvm_tlb_flush_vmid(struct kvm *kvm); 54 54 55 55 static void __hyp_text __tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa) 56 56 { 57 57 __tlb_flush_vmid(kvm); 58 58 } 59 59 60 - __alias(__tlb_flush_vmid_ipa) void __weak __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, 60 + __alias(__tlb_flush_vmid_ipa) void __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, 61 61 phys_addr_t ipa); 62 62 63 63 static void __hyp_text __tlb_flush_vm_context(void) ··· 67 67 dsb(ish); 68 68 } 69 69 70 - __alias(__tlb_flush_vm_context) void __weak __kvm_flush_vm_context(void); 70 + __alias(__tlb_flush_vm_context) void __kvm_flush_vm_context(void);