From: Marc Zyngier <marc.zyngier@arm.com>
Date: Thu, 24 Jan 2013 13:39:43 +0000 (+0000)
Subject: ARM: gic: add __ASSEMBLY__ guard to C definitions
X-Git-Tag: v3.9-rc1~115^2~1^2~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a96ab03917dcf4c9477d03b31e8d74779bca1074;p=profile%2Fivi%2Fkernel-x86-ivi.git

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>
---

diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
index ef61d80..3fd8e42 100644
--- a/include/linux/irqchip/arm-gic.h
+++ b/include/linux/irqchip/arm-gic.h
@@ -57,6 +57,8 @@
 #define GICH_MISR_EOI			(1 << 0)
 #define GICH_MISR_U			(1 << 1)
 
+#ifndef __ASSEMBLY__
+
 struct device_node;
 
 extern struct irq_chip gic_arch_extn;
@@ -72,4 +74,6 @@ static inline void gic_init(unsigned int nr, int start,
 	gic_init_bases(nr, start, dist, cpu, 0, NULL);
 }
 
+#endif /* __ASSEMBLY */
+
 #endif