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 <[email protected]>
Reviewed-by: Marc Zygnier <[email protected]>
Acked-by: Catalin Marinas <[email protected]>
Cc: Tirumalesh Chalamarla <[email protected]>
Cc: [email protected]
Cc: Jason Cooper <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Thomas Gleixner <[email protected]>
This commit is contained in:
Robert Richter 2015-09-21 22:58:39 +02:00 • committed by Thomas Gleixner
commit 8ac2a1704a

View file

@ -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)