Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull irq fixes from Thomas Gleixner:
 - a few simple fixes for fallout from the recent gic-v3 changes
 - a workaround for a Cavium thunderX erratum
 - a bugfix for the pic32 irqchip to make external interrupts work proper
 - a missing return value in the generic IPI management code

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/irq-pic32-evic: Fix bug with external interrupts.
  irqchip/gicv3-its: numa: Enable workaround for Cavium thunderx erratum 23144
  irqchip/gic-v3: Fix quiescence check in gic_enable_redist
  irqchip/gic-v3: Fix copy+paste mistakes in defines
  irqchip/gic-v3: Fix ICC_SGI1R_EL1.INTID decoding mask
  genirq: Fix missing return value in irq_destroy_ipi()

diff --combined arch/arm64/Kconfig
index 5fe3208,57a9f67..5a0a691
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -113,18 -113,6 +113,18 @@@ config ARCH_PHYS_ADDR_T_64BI
  config MMU
        def_bool y
  
 +config ARM64_PAGE_SHIFT
 +      int
 +      default 16 if ARM64_64K_PAGES
 +      default 14 if ARM64_16K_PAGES
 +      default 12
 +
 +config ARM64_CONT_SHIFT
 +      int
 +      default 5 if ARM64_64K_PAGES
 +      default 7 if ARM64_16K_PAGES
 +      default 4
 +
  config ARCH_MMAP_RND_BITS_MIN
         default 14 if ARM64_64K_PAGES
         default 16 if ARM64_16K_PAGES
@@@ -438,6 -426,15 +438,15 @@@ config CAVIUM_ERRATUM_2237
  
          If unsure, say Y.
  
+ config CAVIUM_ERRATUM_23144
+       bool "Cavium erratum 23144: ITS SYNC hang on dual socket system"
+       depends on NUMA
+       default y
+       help
+         ITS SYNC command hang for cross node io and collections/cpu mapping.
+ 
+         If unsure, say Y.
+ 
  config CAVIUM_ERRATUM_23154
        bool "Cavium erratum 23154: Access to ICC_IAR1_EL1 is not sync'ed"
        default y