Merge branch 'core/irq_work' of git://git.kernel.org/pub/scm/linux/kernel/git/frederi...
Ingo Molnar [Thu, 24 Jan 2013 11:48:41 +0000 (12:48 +0100)]
irq_work fixes and cleanups, in preparation for full dyntics support.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1  2 
arch/alpha/Kconfig
arch/arm/Kconfig
arch/arm64/Kconfig
arch/frv/Kconfig
arch/mips/Kconfig
arch/parisc/Kconfig
arch/powerpc/Kconfig
arch/s390/Kconfig
arch/sparc/Kconfig
arch/x86/Kconfig
init/Kconfig

Simple merge
Simple merge
@@@ -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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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
Simple merge
diff --cc init/Kconfig
Simple merge