[Devel] [PATCH RHEL7 COMMIT] irq: make definition of irq_set_vcpu_affinity() static

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-514.vz7.27.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-514.vz7.27.13
------>
commit 55cf72755546bbb2f31f02c25b273a3cfbea3213
Author: Alexey V. Vissarionov <gremlin at gremlin.ru>
Date:   Tue Jan 17 16:59:22 2017 +0400

    irq: make definition of irq_set_vcpu_affinity() static
    
    Otherwise apic.o and io_apic.o have multiple definitions of it
    in case CONFIG_IRQ_REMAP is not set.
    
    Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
---
 arch/x86/include/asm/irq_remapping.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/irq_remapping.h b/arch/x86/include/asm/irq_remapping.h
index 2832aed..4ee3ac2 100644
--- a/arch/x86/include/asm/irq_remapping.h
+++ b/arch/x86/include/asm/irq_remapping.h
@@ -110,7 +110,7 @@ static inline bool setup_remapped_irq(int irq,
 	return false;
 }
 
-int irq_set_vcpu_affinity(unsigned int irq, void *vcpu_info)
+static inline int irq_set_vcpu_affinity(unsigned int irq, void *vcpu_info)
 {
 	return -ENOSYS;
 }