From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 May 2012 03:33:19 +0000 (-0700)
Subject: Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=471368557a734c6c486ee757952c902b36e7fd01;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'irq-core-for-linus' of git://git./linux/kernel/git/tip/tip

Pull core irq changes from Ingo Molnar:
 "A collection of small fixes."

By Thomas Gleixner
* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  hexagon: Remove select of not longer existing Kconfig switches
  arm: Select core options instead of redefining them
  genirq: Do not consider disabled wakeup irqs
  genirq: Allow check_wakeup_irqs to notice level-triggered interrupts
  genirq: Be more informative on irq type mismatch
  genirq: Reject bogus threaded irq requests
  genirq: Streamline irq_action
---

471368557a734c6c486ee757952c902b36e7fd01
diff --cc arch/arm/Kconfig
index 4305ae25652b,1f516766aed6..002b1c8da225
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -31,13 -30,12 +31,15 @@@ config AR
  	select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7))
  	select HAVE_C_RECORDMCOUNT
  	select HAVE_GENERIC_HARDIRQS
 +	select HARDIRQS_SW_RESEND
 +	select GENERIC_IRQ_PROBE
  	select GENERIC_IRQ_SHOW
+ 	select GENERIC_IRQ_PROBE
+ 	select HARDIRQS_SW_RESEND
  	select CPU_PM if (SUSPEND || CPU_IDLE)
  	select GENERIC_PCI_IOMAP
 -	select HAVE_BPF_JIT if NET
 +	select HAVE_BPF_JIT
 +	select GENERIC_SMP_IDLE_THREAD
  	help
  	  The ARM series is a line of low-power-consumption RISC chip designs
  	  licensed by ARM Ltd and targeted at embedded applications and