Fix "__attribute__((weak))" warnings Signed-off-by: Henry Sloan <henryksloan@xxxxxxxxx> --- virt/kvm/eventfd.c | 12 ++++++------ virt/kvm/irqchip.c | 2 +- virt/kvm/kvm_main.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c index 1054ddb915b0..14aef85829ed 100644 --- a/virt/kvm/eventfd.c +++ b/virt/kvm/eventfd.c @@ -32,7 +32,7 @@ static struct workqueue_struct *irqfd_cleanup_wq; -bool __attribute__((weak)) +bool __weak kvm_arch_irqfd_allowed(struct kvm *kvm, struct kvm_irqfd *args) { return true; @@ -169,7 +169,7 @@ irqfd_deactivate(struct kvm_kernel_irqfd *irqfd) queue_work(irqfd_cleanup_wq, &irqfd->shutdown); } -int __attribute__((weak)) kvm_arch_set_irq_inatomic( +int __weak kvm_arch_set_irq_inatomic( struct kvm_kernel_irq_routing_entry *irq, struct kvm *kvm, int irq_source_id, int level, @@ -265,24 +265,24 @@ static void irqfd_update(struct kvm *kvm, struct kvm_kernel_irqfd *irqfd) } #ifdef CONFIG_HAVE_KVM_IRQ_BYPASS -void __attribute__((weak)) kvm_arch_irq_bypass_stop( +void __weak kvm_arch_irq_bypass_stop( struct irq_bypass_consumer *cons) { } -void __attribute__((weak)) kvm_arch_irq_bypass_start( +void __weak kvm_arch_irq_bypass_start( struct irq_bypass_consumer *cons) { } -int __attribute__((weak)) kvm_arch_update_irqfd_routing( +int __weak kvm_arch_update_irqfd_routing( struct kvm *kvm, unsigned int host_irq, uint32_t guest_irq, bool set) { return 0; } -bool __attribute__((weak)) kvm_arch_irqfd_route_changed( +bool __weak kvm_arch_irqfd_route_changed( struct kvm_kernel_irq_routing_entry *old, struct kvm_kernel_irq_routing_entry *new) { diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c index dcd51e6efb8a..baa551aec010 100644 --- a/virt/kvm/irqchip.c +++ b/virt/kvm/irqchip.c @@ -157,7 +157,7 @@ static int setup_routing_entry(struct kvm *kvm, return 0; } -void __attribute__((weak)) kvm_arch_irq_routing_update(struct kvm *kvm) +void __weak kvm_arch_irq_routing_update(struct kvm *kvm) { } diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index c5fb79e64e75..af74cf3b6446 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -4386,7 +4386,7 @@ static int kvm_vm_ioctl_reset_dirty_pages(struct kvm *kvm) return cleared; } -int __attribute__((weak)) kvm_vm_ioctl_enable_cap(struct kvm *kvm, +int __weak kvm_vm_ioctl_enable_cap(struct kvm *kvm, struct kvm_enable_cap *cap) { return -EINVAL; -- 2.35.1