From: tip-bot for Marc Zyngier <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com,
linux-arm-kernel@lists.infradead.org, jason@lakedaemon.net,
marc.zyngier@arm.com, mingo@kernel.org, tglx@linutronix.de
Subject: [tip:irq/urgent] irqchip/gic-v3: Add missing include for barrier.h
Date: Thu, 10 Dec 2015 10:16:07 -0800 [thread overview]
Message-ID: <tip-8e31ed9c189788463c3b6c1f950cd90755f05f76@git.kernel.org> (raw)
In-Reply-To: <1449483072-17694-3-git-send-email-marc.zyngier@arm.com>
Commit-ID: 8e31ed9c189788463c3b6c1f950cd90755f05f76
Gitweb: http://git.kernel.org/tip/8e31ed9c189788463c3b6c1f950cd90755f05f76
Author: Marc Zyngier <marc.zyngier@arm.com>
AuthorDate: Mon, 7 Dec 2015 10:11:12 +0000
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Thu, 10 Dec 2015 19:13:26 +0100
irqchip/gic-v3: Add missing include for barrier.h
Both the 32bit and 64bit versions of the GICv3 header file are using
barriers, but neglect to include barrier.h, leading to an interesting
splat in some circumstances.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: <linux-arm-kernel@lists.infradead.org>
Cc: Jason Cooper <jason@lakedaemon.net>
Link: http://lkml.kernel.org/r/1449483072-17694-3-git-send-email-marc.zyngier@arm.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/arm/include/asm/arch_gicv3.h | 1 +
arch/arm64/include/asm/arch_gicv3.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/arch/arm/include/asm/arch_gicv3.h b/arch/arm/include/asm/arch_gicv3.h
index 6607d97..7da5503 100644
--- a/arch/arm/include/asm/arch_gicv3.h
+++ b/arch/arm/include/asm/arch_gicv3.h
@@ -21,6 +21,7 @@
#ifndef __ASSEMBLY__
#include <linux/io.h>
+#include <asm/barrier.h>
#define __ACCESS_CP15(CRn, Op1, CRm, Op2) p15, Op1, %0, CRn, CRm, Op2
#define __ACCESS_CP15_64(Op1, CRm) p15, Op1, %Q0, %R0, CRm
diff --git a/arch/arm64/include/asm/arch_gicv3.h b/arch/arm64/include/asm/arch_gicv3.h
index 030cdcb..2731d3b 100644
--- a/arch/arm64/include/asm/arch_gicv3.h
+++ b/arch/arm64/include/asm/arch_gicv3.h
@@ -77,6 +77,7 @@
#ifndef __ASSEMBLY__
#include <linux/stringify.h>
+#include <asm/barrier.h>
/*
* Low-level accessors
prev parent reply other threads:[~2015-12-10 18:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-07 10:11 [PATCH 0/2] irqchip/gic-v3: Small cleanups for 4.4 Marc Zyngier
2015-12-07 10:11 ` [PATCH 1/2] irqchip/gic-v3: Add missing struct device_node declaration Marc Zyngier
2015-12-10 18:15 ` [tip:irq/urgent] " tip-bot for Marc Zyngier
2015-12-07 10:11 ` [PATCH 2/2] irqchip/gic-v3: Add missing include for barrier.h Marc Zyngier
2015-12-10 18:16 ` tip-bot for Marc Zyngier [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-8e31ed9c189788463c3b6c1f950cd90755f05f76@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome