Commit-ID: 8ac2a1704a9f315d490ca1050b8fe8367644e675 Gitweb: http://git.kernel.org/tip/8ac2a1704a9f315d490ca1050b8fe8367644e675 Author: Robert Richter <rrich...@cavium.com> AuthorDate: Mon, 21 Sep 2015 22:58:39 +0200 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Tue, 29 Sep 2015 10:10:54 +0200
irqchip/gicv3-its: Use new jump label API Use newly introduced jump label API. Make this a separate patch for easier backporting to older kernels of the errata patch set. Signed-off-by: Robert Richter <rrich...@cavium.com> Reviewed-by: Marc Zygnier <marc.zyng...@arm.com> Acked-by: Catalin Marinas <catalin.mari...@arm.com> Cc: Tirumalesh Chalamarla <tchalama...@cavium.com> Cc: linux-arm-ker...@lists.infradead.org Cc: Jason Cooper <ja...@lakedaemon.net> Link: http://lkml.kernel.org/r/1442869119-1814-7-git-send-email-r...@kernel.org Signed-off-by: Thomas Gleixner <t...@linutronix.de> --- drivers/irqchip/irq-gic-v3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index eecec71..149e3c6 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -139,11 +139,11 @@ static u64 gic_read_iar_cavium_thunderx(void) return irqstat; } -static struct static_key is_cavium_thunderx = STATIC_KEY_INIT_FALSE; +static DEFINE_STATIC_KEY_FALSE(is_cavium_thunderx); static u64 __maybe_unused gic_read_iar(void) { - if (static_key_false(&is_cavium_thunderx)) + if (static_branch_unlikely(&is_cavium_thunderx)) return gic_read_iar_cavium_thunderx(); else return gic_read_iar_common(); @@ -871,7 +871,7 @@ static const struct irq_domain_ops gic_irq_domain_ops = { static void gicv3_enable_quirks(void) { if (cpus_have_cap(ARM64_WORKAROUND_CAVIUM_23154)) - static_key_slow_inc(&is_cavium_thunderx); + static_branch_enable(&is_cavium_thunderx); } static int __init gic_of_init(struct device_node *node, struct device_node *parent) -- 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/
