Skip to content

Commit dec9cbf

Browse files
committed
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixlets from Thomas Gleixner: "Two trivial fixes which add missing header fileas and forward declarations so the code will compile even when the magic include chains are different" * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip/gic-v3: Add missing include for barrier.h irqchip/gic-v3: Add missing struct device_node declaration
2 parents 43afc99 + 8e31ed9 commit dec9cbf

File tree

3 files changed

+3
-0
lines changed

3 files changed

+3
-0
lines changed

arch/arm/include/asm/arch_gicv3.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#ifndef __ASSEMBLY__
2222

2323
#include <linux/io.h>
24+
#include <asm/barrier.h>
2425

2526
#define __ACCESS_CP15(CRn, Op1, CRm, Op2) p15, Op1, %0, CRn, CRm, Op2
2627
#define __ACCESS_CP15_64(Op1, CRm) p15, Op1, %Q0, %R0, CRm

arch/arm64/include/asm/arch_gicv3.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
#ifndef __ASSEMBLY__
7878

7979
#include <linux/stringify.h>
80+
#include <asm/barrier.h>
8081

8182
/*
8283
* Low-level accessors

include/linux/irqchip/arm-gic-v3.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,7 @@ struct rdists {
330330
};
331331

332332
struct irq_domain;
333+
struct device_node;
333334
int its_cpu_init(void);
334335
int its_init(struct device_node *node, struct rdists *rdists,
335336
struct irq_domain *domain);

0 commit comments

Comments
 (0)