• Olof Johansson's avatar
    Merge branch 'gic/cleanup' into next/soc · e0d20b69
    Olof Johansson authored
    Merge in the gic cleanup since it has a handful of annoying internal conflicts
    with soc development branches. All of them are delete/delete conflicts.
    
    * gic/cleanup:
      irqchip: vic: add include of linux/irq.h
      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
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    
    Conflicts:
    	arch/arm/mach-shmobile/smp-emev2.c
    	arch/arm/mach-shmobile/smp-r8a7779.c
    	arch/arm/mach-shmobile/smp-sh73a0.c
    	arch/arm/mach-socfpga/platsmp.c
    e0d20b69
platsmp.c 2.74 KB