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

Submitted by Konstantin Khorenko on Jan. 17, 2017, 1:02 p.m.

Details

Message ID 201701171302.v0HD2vJH027817@finist_cl7.x64_64.work.ct
State New
Series "irq_remapping.h"
Headers show

Commit Message

Konstantin Khorenko Jan. 17, 2017, 1:02 p.m.
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@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@virtuozzo.com>
---
 arch/x86/include/asm/irq_remapping.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

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;
 }

Comments

Konstantin Khorenko Jan. 17, 2017, 1:05 p.m.
Hi Alexey,

thank you for the patch, applied.

Please file a bug to RedHat as well, it's their code.

--
Best regards,

Konstantin Khorenko,
Virtuozzo Linux Kernel Team

On 01/17/2017 04:02 PM, Konstantin Khorenko wrote:
> 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@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: Alexey V. Vissarionov <gremlin@gremlin.ru>
 >     Acked-by: Konstantin Khorenko <khorenko@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;
>  }
> .
>