From: Ingo Molnar Date: Thu, 24 Jan 2013 11:48:41 +0000 (+0100) Subject: Merge branch 'core/irq_work' of git://git.kernel.org/pub/scm/linux/kernel/git/frederi... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=786133f6e8ff94aaa78cd6b7844d04c227098327;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'core/irq_work' of git://git./linux/kernel/git/frederic/linux-dynticks into irq/core irq_work fixes and cleanups, in preparation for full dyntics support. Signed-off-by: Ingo Molnar --- 786133f6e8ff94aaa78cd6b7844d04c227098327 diff --cc arch/arm64/Kconfig index f8f362aafee9,dd50d72881c6..75e915b72471 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@@ -21,9 -17,9 +21,8 @@@ config ARM6 select HAVE_GENERIC_DMA_COHERENT select HAVE_GENERIC_HARDIRQS select HAVE_HW_BREAKPOINT if PERF_EVENTS - select HAVE_IRQ_WORK select HAVE_MEMBLOCK select HAVE_PERF_EVENTS - select HAVE_SPARSE_IRQ select IRQ_DOMAIN select MODULES_USE_ELF_RELA select NO_BOOTMEM diff --cc arch/sparc/Kconfig index 9f2edb5c5551,05a478fa9143..ed937ae72df3 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@@ -20,10 -20,8 +20,9 @@@ config SPAR select HAVE_ARCH_TRACEHOOK select SYSCTL_EXCEPTION_TRACE select ARCH_WANT_OPTIONAL_GPIOLIB + select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE select RTC_CLASS select RTC_DRV_M48T59 - select HAVE_IRQ_WORK select HAVE_DMA_ATTRS select HAVE_DMA_API_DEBUG select HAVE_ARCH_JUMP_LABEL