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

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/kernel/head.S
Simple merge

diff --cc drivers/irqchip/irq-gic.c
Simple merge

diff --cc include/linux/irqchip/arm-gic.h
index 40643ca79cd90216290aa3256934c09059ca619a,14faee7c97143314ebb6d7628ccb418619bc74a0..13439bac2967a7178fb05141abb0674befb1b021
--- 1/include/linux/irqchip/arm-gic.h
--- 2/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 */
 +#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