3.13.11.3 -stable review patch. If anyone has any objections, please let me know.
------------------ From: Thomas Gleixner <t...@linutronix.de> commit ffde1de64012c406dfdda8690918248b472f24e4 upstream. To support the affinity setting of per cpu timers in the early startup of a not yet online cpu, implement the force logic, which disables the cpu online check. Tagged for stable to allow a simple fix of the affected SoC clock event drivers. Signed-off-by: Thomas Gleixner <t...@linutronix.de> Tested-by: Krzysztof Kozlowski <k.kozlow...@samsung.com> Cc: Kyungmin Park <kyungmin.p...@samsung.com> Cc: Marek Szyprowski <m.szyprow...@samsung.com> Cc: Bartlomiej Zolnierkiewicz <b.zolnier...@samsung.com> Cc: Tomasz Figa <t.f...@samsung.com>, Cc: Daniel Lezcano <daniel.lezc...@linaro.org>, Cc: Kukjin Kim <kgene....@samsung.com> Cc: linux-arm-ker...@lists.infradead.org, Link: http://lkml.kernel.org/r/20140416143315.916984...@linutronix.de Signed-off-by: Thomas Gleixner <t...@linutronix.de> Signed-off-by: Kamal Mostafa <ka...@canonical.com> --- drivers/irqchip/irq-gic.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 341c601..ac2d41b 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -246,10 +246,14 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val, bool force) { void __iomem *reg = gic_dist_base(d) + GIC_DIST_TARGET + (gic_irq(d) & ~3); - unsigned int shift = (gic_irq(d) % 4) * 8; - unsigned int cpu = cpumask_any_and(mask_val, cpu_online_mask); + unsigned int cpu, shift = (gic_irq(d) % 4) * 8; u32 val, mask, bit; + if (!force) + cpu = cpumask_any_and(mask_val, cpu_online_mask); + else + cpu = cpumask_first(mask_val); + if (cpu >= NR_GIC_CPU_IF || cpu >= nr_cpu_ids) return -EINVAL; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
