lkml.org 
[lkml]   [2018]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 049/115] irqchip/bcm7038-l1: Hide cpu offline callback when building for !SMP
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jonas Gorski <jonas.gorski@gmail.com>

    [ Upstream commit 0702bc4d2fe793018ad9aa0eb14bff7f526c4095 ]

    When compiling bmips with SMP disabled, the build fails with:

    drivers/irqchip/irq-bcm7038-l1.o: In function `bcm7038_l1_cpu_offline':
    drivers/irqchip/irq-bcm7038-l1.c:242: undefined reference to `irq_set_affinity_locked'
    make[5]: *** [vmlinux] Error 1

    Fix this by adding and setting bcm7038_l1_cpu_offline only when actually
    compiling for SMP. It wouldn't have been used anyway, as it requires
    CPU_HOTPLUG, which in turn requires SMP.

    Fixes: 34c535793bcb ("irqchip/bcm7038-l1: Implement irq_cpu_offline() callback")
    Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/irqchip/irq-bcm7038-l1.c | 4 ++++
    1 file changed, 4 insertions(+)

    --- a/drivers/irqchip/irq-bcm7038-l1.c
    +++ b/drivers/irqchip/irq-bcm7038-l1.c
    @@ -217,6 +217,7 @@ static int bcm7038_l1_set_affinity(struc
    return 0;
    }

    +#ifdef CONFIG_SMP
    static void bcm7038_l1_cpu_offline(struct irq_data *d)
    {
    struct cpumask *mask = irq_data_get_affinity_mask(d);
    @@ -241,6 +242,7 @@ static void bcm7038_l1_cpu_offline(struc
    }
    irq_set_affinity_locked(d, &new_affinity, false);
    }
    +#endif

    static int __init bcm7038_l1_init_one(struct device_node *dn,
    unsigned int idx,
    @@ -293,7 +295,9 @@ static struct irq_chip bcm7038_l1_irq_ch
    .irq_mask = bcm7038_l1_mask,
    .irq_unmask = bcm7038_l1_unmask,
    .irq_set_affinity = bcm7038_l1_set_affinity,
    +#ifdef CONFIG_SMP
    .irq_cpu_offline = bcm7038_l1_cpu_offline,
    +#endif
    };

    static int bcm7038_l1_map(struct irq_domain *d, unsigned int virq,

    \
     
     \ /
      Last update: 2018-09-13 16:16    [W:4.342 / U:0.376 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site