From: Olof Johansson <olof@lixom.net>
Date: Tue, 2 Apr 2013 17:59:15 +0000 (-0700)
Subject: Merge branch 'gic' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux... 
X-Git-Tag: firefly_0821_release~3680^2~607^2~17
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c2573077dfacebdf58f69c666e8f15e9528e5a12;p=firefly-linux-kernel-4.4.55.git

Merge branch 'gic' of git://git./linux/kernel/git/cmarinas/linux-aarch64 into next/cleanup

* 'gic' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
  irqchip: gic: Perform the gic_secondary_init() call via CPU notifier
  irqchip: gic: Call handle_bad_irq() directly
  arm: Move chained_irq_(enter|exit) to a generic file
  arm: Move the set_handle_irq and handle_arch_irq declarations to asm/irq.h
  + Linux 3.9-rc3

Signed-off-by: Olof Johansson <olof@lixom.net>
---

c2573077dfacebdf58f69c666e8f15e9528e5a12
diff --cc drivers/irqchip/irq-gic.c
index 80a4f7a7d7b8,add1fd84fc4b..47aea33a0782
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@@ -799,15 -820,8 +820,8 @@@ void __init gic_init_bases(unsigned in
  	gic_pm_init(gic);
  }
  
- void __cpuinit gic_secondary_init(unsigned int gic_nr)
- {
- 	BUG_ON(gic_nr >= MAX_GIC_NR);
- 
- 	gic_cpu_init(&gic_data[gic_nr]);
- }
- 
  #ifdef CONFIG_OF
 -static int gic_cnt __initdata = 0;
 +static int gic_cnt __initdata;
  
  int __init gic_of_init(struct device_node *node, struct device_node *parent)
  {