diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2013-01-24 08:39:43 -0500 |
---|---|---|
committer | Marc Zyngier <marc.zyngier@arm.com> | 2013-02-11 13:58:34 -0500 |
commit | a96ab03917dcf4c9477d03b31e8d74779bca1074 (patch) | |
tree | d603ba162fcef6d27581b8037ed25029e2e781fa /include/linux/irqchip/arm-gic.h | |
parent | fdf77a72ec110572ac033d499c8be8b389c05740 (diff) |
ARM: gic: add __ASSEMBLY__ guard to C definitions
The GIC include file being used by some of the KVM assembly code,
wrap the C definitions with a #ifdef __ASSEMBLY__ guard.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'include/linux/irqchip/arm-gic.h')
-rw-r--r-- | include/linux/irqchip/arm-gic.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h index ef61d80946be..3fd8e4290a1c 100644 --- a/include/linux/irqchip/arm-gic.h +++ b/include/linux/irqchip/arm-gic.h | |||
@@ -57,6 +57,8 @@ | |||
57 | #define GICH_MISR_EOI (1 << 0) | 57 | #define GICH_MISR_EOI (1 << 0) |
58 | #define GICH_MISR_U (1 << 1) | 58 | #define GICH_MISR_U (1 << 1) |
59 | 59 | ||
60 | #ifndef __ASSEMBLY__ | ||
61 | |||
60 | struct device_node; | 62 | struct device_node; |
61 | 63 | ||
62 | extern struct irq_chip gic_arch_extn; | 64 | extern struct irq_chip gic_arch_extn; |
@@ -72,4 +74,6 @@ static inline void gic_init(unsigned int nr, int start, | |||
72 | gic_init_bases(nr, start, dist, cpu, 0, NULL); | 74 | gic_init_bases(nr, start, dist, cpu, 0, NULL); |
73 | } | 75 | } |
74 | 76 | ||
77 | #endif /* __ASSEMBLY */ | ||
78 | |||
75 | #endif | 79 | #endif |