summaryrefslogtreecommitdiff
path: root/drivers/irqchip/irq-gic-v3.c
diff options
context:
space:
mode:
authorRobert Richter <rrichter@cavium.com>2015-09-21 23:58:39 +0300
committerThomas Gleixner <tglx@linutronix.de>2015-09-29 11:10:54 +0300
commit8ac2a1704a9f315d490ca1050b8fe8367644e675 (patch)
tree7382fd785a2798617b78064da453fffd0cf1edf1 /drivers/irqchip/irq-gic-v3.c
parent94100970743365a9f9e186520e77ef56c492058d (diff)
downloadlinux-8ac2a1704a9f315d490ca1050b8fe8367644e675.tar.xz
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 <rrichter@cavium.com> Reviewed-by: Marc Zygnier <marc.zyngier@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Cc: Tirumalesh Chalamarla <tchalamarla@cavium.com> Cc: linux-arm-kernel@lists.infradead.org Cc: Jason Cooper <jason@lakedaemon.net> Link: http://lkml.kernel.org/r/1442869119-1814-7-git-send-email-rric@kernel.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/irqchip/irq-gic-v3.c')
-rw-r--r--drivers/irqchip/irq-gic-v3.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index eecec71faa11..149e3c6b3618 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)