Skip to content

Commit

Permalink
irqchip/gic-v3: Add missing include for barrier.h
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Marc Zyngier authored and Thomas Gleixner committed Dec 10, 2015
1 parent 059393c commit 8e31ed9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm/include/asm/arch_gicv3.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/include/asm/arch_gicv3.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
#ifndef __ASSEMBLY__

#include <linux/stringify.h>
#include <asm/barrier.h>

/*
* Low-level accessors
Expand Down

0 comments on commit 8e31ed9

Please sign in to comment.