From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933224AbbI2IR6 (ORCPT ); Tue, 29 Sep 2015 04:17:58 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37313 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932777AbbI2IRr (ORCPT ); Tue, 29 Sep 2015 04:17:47 -0400 Date: Tue, 29 Sep 2015 01:17:28 -0700 From: tip-bot for Robert Richter Message-ID: Cc: mingo@kernel.org, tchalamarla@cavium.com, tglx@linutronix.de, jason@lakedaemon.net, marc.zyngier@arm.com, catalin.marinas@arm.com, hpa@zytor.com, linux-kernel@vger.kernel.org, rrichter@cavium.com Reply-To: mingo@kernel.org, tchalamarla@cavium.com, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, rrichter@cavium.com, jason@lakedaemon.net, marc.zyngier@arm.com, catalin.marinas@arm.com In-Reply-To: <1442869119-1814-7-git-send-email-rric@kernel.org> References: <1442869119-1814-7-git-send-email-rric@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] irqchip/gicv3-its: Use new jump label API Git-Commit-ID: 8ac2a1704a9f315d490ca1050b8fe8367644e675 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 8ac2a1704a9f315d490ca1050b8fe8367644e675 Gitweb: http://git.kernel.org/tip/8ac2a1704a9f315d490ca1050b8fe8367644e675 Author: Robert Richter AuthorDate: Mon, 21 Sep 2015 22:58:39 +0200 Committer: Thomas Gleixner 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 Reviewed-by: Marc Zygnier Acked-by: Catalin Marinas Cc: Tirumalesh Chalamarla Cc: linux-arm-kernel@lists.infradead.org Cc: Jason Cooper Link: http://lkml.kernel.org/r/1442869119-1814-7-git-send-email-rric@kernel.org Signed-off-by: Thomas Gleixner --- 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)