public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-10-31 16:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

irqchip/gicv3-its: Use new jump label API

Browse source 
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>
This commit is contained in:
Robert Richter 2015-09-21 22:58:39 +02:00 • committed by Thomas Gleixner
parent 9410097074
commit 8ac2a1704a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/irqchip/irq-gic-v3.c
View file

@ -139,11 +139,11 @@ static u64 gic_read_iar_cavium_thunderx(void)
return irqstat; 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) 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(); return gic_read_iar_cavium_thunderx();
else else
return gic_read_iar_common(); 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) static void gicv3_enable_quirks(void)
{ {
if (cpus_have_cap(ARM64_WORKAROUND_CAVIUM_23154)) 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) static int __init gic_of_init(struct device_node *node, struct device_node *parent)