From: Mark Brown <broonie@kernel.org>
Date: Fri, 10 Oct 2014 19:45:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/gicv3' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~36^2~17
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1ab056a5fb0d123436b862806734c6a9dc4651a4;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'lsk/v3.10/topic/gicv3' into linux-linaro-lsk

Conflicts:
	drivers/irqchip/irq-gic.c
	include/linux/irqchip/arm-gic.h
---

1ab056a5fb0d123436b862806734c6a9dc4651a4
diff --cc include/linux/irqchip/arm-gic.h
index 40643ca79cd9,14faee7c9714..13439bac2967
--- a/include/linux/irqchip/arm-gic.h
+++ b/include/linux/irqchip/arm-gic.h
@@@ -68,9 -70,8 +70,10 @@@ extern struct irq_chip gic_arch_extn
  void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
  		    u32 offset, struct device_node *);
  void gic_cascade_irq(unsigned int gic_nr, unsigned int irq);
+ void gic_cpu_if_down(void);
  
 +void gic_cpu_if_down(void);
 +
  static inline void gic_init(unsigned int nr, int start,
  			    void __iomem *dist , void __iomem *cpu)
  {
@@@ -82,6 -83,11 +85,12 @@@ int gic_get_cpu_id(unsigned int cpu)
  void gic_migrate_target(unsigned int new_cpu_id);
  unsigned long gic_get_sgir_physaddr(void);
  
 +#endif /* __ASSEMBLY */
 +
+ extern const struct irq_domain_ops *gic_routable_irq_domain_ops;
+ static inline void __init register_routable_domain_ops
+ 					(const struct irq_domain_ops *ops)
+ {
+ 	gic_routable_irq_domain_ops = ops;
+ }
 -#endif /* __ASSEMBLY */
  #endif