Commit dec9cbf9 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 43afc99d 8e31ed9c
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <linux/io.h> #include <linux/io.h>
#include <asm/barrier.h>
#define __ACCESS_CP15(CRn, Op1, CRm, Op2) p15, Op1, %0, CRn, CRm, Op2 #define __ACCESS_CP15(CRn, Op1, CRm, Op2) p15, Op1, %0, CRn, CRm, Op2
#define __ACCESS_CP15_64(Op1, CRm) p15, Op1, %Q0, %R0, CRm #define __ACCESS_CP15_64(Op1, CRm) p15, Op1, %Q0, %R0, CRm
......
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <linux/stringify.h> #include <linux/stringify.h>
#include <asm/barrier.h>
/* /*
* Low-level accessors * Low-level accessors
......
...@@ -330,6 +330,7 @@ struct rdists { ...@@ -330,6 +330,7 @@ struct rdists {
}; };
struct irq_domain; struct irq_domain;
struct device_node;
int its_cpu_init(void); int its_cpu_init(void);
int its_init(struct device_node *node, struct rdists *rdists, int its_init(struct device_node *node, struct rdists *rdists,
struct irq_domain *domain); struct irq_domain *domain);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment