Remove GENERIC_HARDIRQ config option

After the last architecture switched to generic hard irqs the config
options HAVE_GENERIC_HARDIRQS & GENERIC_HARDIRQS and the related code
for !CONFIG_GENERIC_HARDIRQS can be removed.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 082d9b4b54723d0253e7ca3355387886b81f72f4..35a300d4a9fb37f3a08e3f63365c72bcc2a3ecbf 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -7,7 +7,6 @@ config ALPHA
        select HAVE_PCSPKR_PLATFORM
        select HAVE_PERF_EVENTS
        select HAVE_DMA_ATTRS
        select HAVE_PCSPKR_PLATFORM
        select HAVE_PERF_EVENTS
        select HAVE_DMA_ATTRS

-       select HAVE_GENERIC_HARDIRQS

        select VIRT_TO_BUS
        select GENERIC_IRQ_PROBE
        select AUTO_IRQ_AFFINITY if SMP
        select VIRT_TO_BUS
        select GENERIC_IRQ_PROBE
        select AUTO_IRQ_AFFINITY if SMP

diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index 68fcbb2d59e2abbaac1691652865f33f78949753..91dbb2757afd1d352d38faae2924c8861e435631 100644 (file)
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -20,7 +20,6 @@ config ARC
        select GENERIC_SMP_IDLE_THREAD
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_TRACEHOOK
        select GENERIC_SMP_IDLE_THREAD
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_TRACEHOOK

-       select HAVE_GENERIC_HARDIRQS

        select HAVE_IOREMAP_PROT
        select HAVE_KPROBES
        select HAVE_KRETPROBES
        select HAVE_IOREMAP_PROT
        select HAVE_KPROBES
        select HAVE_KRETPROBES

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d13f6743df4bec9c9c1f8052d2c5985f9784fd87..3f7714d8d2d216bf3bbd7b4a5b227ea982997554 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -37,7 +37,6 @@ config ARM
        select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL)
        select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
        select HAVE_GENERIC_DMA_COHERENT
        select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL)
        select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
        select HAVE_GENERIC_DMA_COHERENT

-       select HAVE_GENERIC_HARDIRQS

        select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7))
        select HAVE_IDE if PCI || ISA || PCMCIA
        select HAVE_IRQ_TIME_ACCOUNTING
        select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7))
        select HAVE_IDE if PCI || ISA || PCMCIA
        select HAVE_IRQ_TIME_ACCOUNTING

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index ae323a45c28c2dac8c18a71c2c1f7a526132536e..c04454876bcbe6520a52ada910a7d193ff884e85 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -23,7 +23,6 @@ config ARM64
        select HAVE_DMA_API_DEBUG
        select HAVE_DMA_ATTRS
        select HAVE_GENERIC_DMA_COHERENT
        select HAVE_DMA_API_DEBUG
        select HAVE_DMA_ATTRS
        select HAVE_GENERIC_DMA_COHERENT

-       select HAVE_GENERIC_HARDIRQS

        select HAVE_HW_BREAKPOINT if PERF_EVENTS
        select HAVE_MEMBLOCK
        select HAVE_PERF_EVENTS
        select HAVE_HW_BREAKPOINT if PERF_EVENTS
        select HAVE_MEMBLOCK
        select HAVE_PERF_EVENTS

diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 549903cfc2cbe6f223025ff1b04017939f7dd336..b6878eb6488483d9d7222f69c43e8390c7610fd2 100644 (file)
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -6,7 +6,6 @@ config AVR32
        select HAVE_CLK
        select HAVE_OPROFILE
        select HAVE_KPROBES
        select HAVE_CLK
        select HAVE_OPROFILE
        select HAVE_KPROBES

-       select HAVE_GENERIC_HARDIRQS

        select VIRT_TO_BUS
        select GENERIC_IRQ_PROBE
        select GENERIC_ATOMIC64
        select VIRT_TO_BUS
        select GENERIC_IRQ_PROBE
        select GENERIC_ATOMIC64

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 3b6abc54b0150c8f02488d7221a70756baf08682..f78c9a2c7e281f2d441a40719e6735226231ceaa 100644 (file)
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -32,7 +32,6 @@ config BLACKFIN
        select HAVE_UNDERSCORE_SYMBOL_PREFIX
        select VIRT_TO_BUS
        select ARCH_WANT_IPC_PARSE_VERSION
        select HAVE_UNDERSCORE_SYMBOL_PREFIX
        select VIRT_TO_BUS
        select ARCH_WANT_IPC_PARSE_VERSION

-       select HAVE_GENERIC_HARDIRQS

        select GENERIC_ATOMIC64
        select GENERIC_IRQ_PROBE
        select USE_GENERIC_SMP_HELPERS if SMP
        select GENERIC_ATOMIC64
        select GENERIC_IRQ_PROBE
        select USE_GENERIC_SMP_HELPERS if SMP

diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig
index f6a3648f5ec3c7030a8c4294be4e3bee54a25b6c..957dd00ea561ce3881a0af87394d349fab04f449 100644 (file)
--- a/arch/c6x/Kconfig
+++ b/arch/c6x/Kconfig
@@ -10,7 +10,6 @@ config C6X
        select GENERIC_IRQ_SHOW
        select HAVE_ARCH_TRACEHOOK
        select HAVE_DMA_API_DEBUG
        select GENERIC_IRQ_SHOW
        select HAVE_ARCH_TRACEHOOK
        select HAVE_DMA_API_DEBUG

-       select HAVE_GENERIC_HARDIRQS

        select HAVE_MEMBLOCK
        select SPARSE_IRQ
        select IRQ_DOMAIN
        select HAVE_MEMBLOCK
        select SPARSE_IRQ
        select IRQ_DOMAIN

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index c699d32598728552d81159815d5ec356f40b76b1..02380bed189c6fda4920412a18f1baab6203d1c1 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -41,7 +41,6 @@ config CRIS
        default y
        select HAVE_IDE
        select GENERIC_ATOMIC64
        default y
        select HAVE_IDE
        select GENERIC_ATOMIC64

-       select HAVE_GENERIC_HARDIRQS

        select HAVE_UID16
        select VIRT_TO_BUS
        select ARCH_WANT_IPC_PARSE_VERSION
        select HAVE_UID16
        select VIRT_TO_BUS
        select ARCH_WANT_IPC_PARSE_VERSION

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 4b6628ea381e45be866e571683b38cf1d45a5177..34aa19352dc1ab87cc2cf11f38e1161dc547a518 100644 (file)
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -5,7 +5,6 @@ config FRV
        select HAVE_ARCH_TRACEHOOK
        select HAVE_PERF_EVENTS
        select HAVE_UID16
        select HAVE_ARCH_TRACEHOOK
        select HAVE_PERF_EVENTS
        select HAVE_UID16

-       select HAVE_GENERIC_HARDIRQS

        select VIRT_TO_BUS
        select GENERIC_IRQ_SHOW
        select HAVE_DEBUG_BUGVERBOSE
        select VIRT_TO_BUS
        select GENERIC_IRQ_SHOW
        select HAVE_DEBUG_BUGVERBOSE

diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 3d6759ee382f2721e29fd5a44f9c06e937fd7e3b..24b1dc2564f1676272c0e230eeda1e7c0d78d9d6 100644 (file)
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -2,7 +2,6 @@ config H8300
        bool
        default y
        select HAVE_IDE
        bool
        default y
        select HAVE_IDE

-       select HAVE_GENERIC_HARDIRQS

        select GENERIC_ATOMIC64
        select HAVE_UID16
        select VIRT_TO_BUS
        select GENERIC_ATOMIC64
        select HAVE_UID16
        select VIRT_TO_BUS

diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index 77d442ab28c8625860c1787df12ac9dd74d7f004..99041b07e61094d964fd1289481c11f739407d04 100644 (file)
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -15,7 +15,6 @@ config HEXAGON
        # select GENERIC_PENDING_IRQ if SMP
        select GENERIC_ATOMIC64
        select HAVE_PERF_EVENTS
        # select GENERIC_PENDING_IRQ if SMP
        select GENERIC_ATOMIC64
        select HAVE_PERF_EVENTS

-       select HAVE_GENERIC_HARDIRQS

        # GENERIC_ALLOCATOR is used by dma_alloc_coherent()
        select GENERIC_ALLOCATOR
        select GENERIC_IRQ_SHOW
        # GENERIC_ALLOCATOR is used by dma_alloc_coherent()
        select GENERIC_ALLOCATOR
        select GENERIC_IRQ_SHOW

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index a86a56d9e73f9512d45c7904f45a8ab45363448f..7740ab10a17192cb0596d0ee442282d549b3ba33 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -21,7 +21,6 @@ config IA64
        select HAVE_KVM
        select HAVE_ARCH_TRACEHOOK
        select HAVE_DMA_API_DEBUG
        select HAVE_KVM
        select HAVE_ARCH_TRACEHOOK
        select HAVE_DMA_API_DEBUG

-       select HAVE_GENERIC_HARDIRQS

        select HAVE_MEMBLOCK
        select HAVE_MEMBLOCK_NODE_MAP
        select HAVE_VIRT_CPU_ACCOUNTING
        select HAVE_MEMBLOCK
        select HAVE_MEMBLOCK_NODE_MAP
        select HAVE_VIRT_CPU_ACCOUNTING

diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 29a7ef4e448b06d2ae8bd9aa0aa1a2fa5f901802..75661fbf4529e6c903fcb2bb61e3b48e5656fd04 100644 (file)
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -9,7 +9,6 @@ config M32R
        select HAVE_KERNEL_LZMA
        select ARCH_WANT_IPC_PARSE_VERSION
        select HAVE_DEBUG_BUGVERBOSE
        select HAVE_KERNEL_LZMA
        select ARCH_WANT_IPC_PARSE_VERSION
        select HAVE_DEBUG_BUGVERBOSE

-       select HAVE_GENERIC_HARDIRQS

        select VIRT_TO_BUS
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW
        select VIRT_TO_BUS
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index c3cda41af801487e1637160ce8e5c4854f3cc713..311a300d48cca82b82a5faa0bf6abbaee42cacef 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -4,7 +4,6 @@ config M68K
        select HAVE_IDE
        select HAVE_AOUT if MMU
        select HAVE_DEBUG_BUGVERBOSE
        select HAVE_IDE
        select HAVE_AOUT if MMU
        select HAVE_DEBUG_BUGVERBOSE

-       select HAVE_GENERIC_HARDIRQS

        select GENERIC_IRQ_SHOW
        select GENERIC_ATOMIC64
        select HAVE_UID16
        select GENERIC_IRQ_SHOW
        select GENERIC_ATOMIC64
        select HAVE_UID16

diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig
index cfd831c2982424fb305671993ce5bd99cfcb1453..36368eb07e13fe629d00ac1f1fdcc8ff06220ba2 100644 (file)
--- a/arch/metag/Kconfig
+++ b/arch/metag/Kconfig
@@ -13,7 +13,6 @@ config METAG
        select HAVE_FTRACE_MCOUNT_RECORD
        select HAVE_FUNCTION_TRACER
        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
        select HAVE_FTRACE_MCOUNT_RECORD
        select HAVE_FUNCTION_TRACER
        select HAVE_FUNCTION_TRACE_MCOUNT_TEST

-       select HAVE_GENERIC_HARDIRQS

        select HAVE_KERNEL_BZIP2
        select HAVE_KERNEL_GZIP
        select HAVE_KERNEL_LZO
        select HAVE_KERNEL_BZIP2
        select HAVE_KERNEL_GZIP
        select HAVE_KERNEL_LZO

diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 3f6659cbc969134e14f8a5500a8bc119368a2d7f..b82f82b743199ac4ff5b54d8cdbe6cc8c1246078 100644 (file)
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -18,7 +18,6 @@ config MICROBLAZE
        select ARCH_WANT_IPC_PARSE_VERSION
        select HAVE_DEBUG_KMEMLEAK
        select IRQ_DOMAIN
        select ARCH_WANT_IPC_PARSE_VERSION
        select HAVE_DEBUG_KMEMLEAK
        select IRQ_DOMAIN

-       select HAVE_GENERIC_HARDIRQS

        select VIRT_TO_BUS
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW
        select VIRT_TO_BUS
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index a9668d4653c28544d81a9ce1ed55caee7e743a37..f75ab4a2f2460a0d5652cbcacf25c2b68a2d24c3 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -25,7 +25,6 @@ config MIPS
        select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
        select HAVE_DMA_ATTRS
        select HAVE_DMA_API_DEBUG
        select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
        select HAVE_DMA_ATTRS
        select HAVE_DMA_API_DEBUG

-       select HAVE_GENERIC_HARDIRQS

        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW
        select GENERIC_PCI_IOMAP
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW
        select GENERIC_PCI_IOMAP

diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index 70e4f663ebd2818d6532bd14cf71c0893867f3b1..6aaa1607001a42980c95a1984c7775bc5359826a 100644 (file)
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@ -1,7 +1,6 @@
 config MN10300
        def_bool y
        select HAVE_OPROFILE
 config MN10300
        def_bool y
        select HAVE_OPROFILE

-       select HAVE_GENERIC_HARDIRQS

        select GENERIC_IRQ_SHOW
        select ARCH_WANT_IPC_PARSE_VERSION
        select HAVE_ARCH_TRACEHOOK
        select GENERIC_IRQ_SHOW
        select ARCH_WANT_IPC_PARSE_VERSION
        select HAVE_ARCH_TRACEHOOK

diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index d60bf98fa5cf399430d5beaaed9e3cd9c7188e67..9488209a52533432b7e42392d1bdd918a45dc840 100644 (file)
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -11,7 +11,6 @@ config OPENRISC
        select HAVE_MEMBLOCK
        select ARCH_REQUIRE_GPIOLIB
         select HAVE_ARCH_TRACEHOOK
        select HAVE_MEMBLOCK
        select ARCH_REQUIRE_GPIOLIB
         select HAVE_ARCH_TRACEHOOK

-       select HAVE_GENERIC_HARDIRQS

        select GENERIC_IRQ_CHIP
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW
        select GENERIC_IRQ_CHIP
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index aa399a5259b6ce406302ac79a8770312ca688aad..ad2ce8dab9963c4dd6867ee83064460576084089 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -14,7 +14,6 @@ config PARISC
        select HAVE_PERF_EVENTS
        select GENERIC_ATOMIC64 if !64BIT
        select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
        select HAVE_PERF_EVENTS
        select GENERIC_ATOMIC64 if !64BIT
        select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

-       select HAVE_GENERIC_HARDIRQS

        select BROKEN_RODATA
        select GENERIC_IRQ_PROBE
        select GENERIC_PCI_IOMAP
        select BROKEN_RODATA
        select GENERIC_IRQ_PROBE
        select GENERIC_PCI_IOMAP

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 6b7530f8183c3c98a0fd42a8cdef3b1643ce33ce..38f3b7e47ec5efd190018de0d9bba1d2ef5b4011 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -114,7 +114,6 @@ config PPC
        select HAVE_PERF_EVENTS
        select HAVE_REGS_AND_STACK_ACCESS_API
        select HAVE_HW_BREAKPOINT if PERF_EVENTS && PPC_BOOK3S_64
        select HAVE_PERF_EVENTS
        select HAVE_REGS_AND_STACK_ACCESS_API
        select HAVE_HW_BREAKPOINT if PERF_EVENTS && PPC_BOOK3S_64

-       select HAVE_GENERIC_HARDIRQS

        select ARCH_WANT_IPC_PARSE_VERSION
        select SPARSE_IRQ
        select IRQ_DOMAIN
        select ARCH_WANT_IPC_PARSE_VERSION
        select SPARSE_IRQ
        select IRQ_DOMAIN

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 3ec272859e1ebc369464309c172ec0e0f48102e7..dcc6ac2d802637ab6e5fb9c004eaa69ba5e01479 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -116,7 +116,6 @@ config S390
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_FUNCTION_TRACER
        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_FUNCTION_TRACER
        select HAVE_FUNCTION_TRACE_MCOUNT_TEST

-       select HAVE_GENERIC_HARDIRQS

        select HAVE_KERNEL_BZIP2
        select HAVE_KERNEL_GZIP
        select HAVE_KERNEL_LZ4
        select HAVE_KERNEL_BZIP2
        select HAVE_KERNEL_GZIP
        select HAVE_KERNEL_LZ4

diff --git a/arch/score/Kconfig b/arch/score/Kconfig
index 5fc237581caf3a6f3b40c41246f4d39d28f8ee55..a1be70db75fec95d9cfa087008edf86a6baf7280 100644 (file)
--- a/arch/score/Kconfig
+++ b/arch/score/Kconfig
@@ -2,7 +2,6 @@ menu "Machine selection"
 
 config SCORE
        def_bool y
 
 config SCORE
        def_bool y

-       select HAVE_GENERIC_HARDIRQS

        select GENERIC_IRQ_SHOW
        select GENERIC_IOMAP
        select GENERIC_ATOMIC64
        select GENERIC_IRQ_SHOW
        select GENERIC_IOMAP
        select GENERIC_ATOMIC64

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 1018ed3a3ca58e4fc677663006ee8a4ead381c25..224f4bc9925ece7f38c85a145cf615aa78082569 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -26,7 +26,6 @@ config SUPERH
        select ARCH_WANT_IPC_PARSE_VERSION
        select HAVE_SYSCALL_TRACEPOINTS
        select HAVE_REGS_AND_STACK_ACCESS_API
        select ARCH_WANT_IPC_PARSE_VERSION
        select HAVE_SYSCALL_TRACEPOINTS
        select HAVE_REGS_AND_STACK_ACCESS_API

-       select HAVE_GENERIC_HARDIRQS

        select MAY_HAVE_SPARSE_IRQ
        select IRQ_FORCED_THREADING
        select RTC_LIB
        select MAY_HAVE_SPARSE_IRQ
        select IRQ_FORCED_THREADING
        select RTC_LIB

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 1570ad2802b3e4620a17f32074324a3248996855..2137ad6674388a8e920fba2d7b9fba0cf88512e6 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -26,7 +26,6 @@ config SPARC
        select HAVE_DMA_ATTRS
        select HAVE_DMA_API_DEBUG
        select HAVE_ARCH_JUMP_LABEL
        select HAVE_DMA_ATTRS
        select HAVE_DMA_API_DEBUG
        select HAVE_ARCH_JUMP_LABEL

-       select HAVE_GENERIC_HARDIRQS

        select GENERIC_IRQ_SHOW
        select ARCH_WANT_IPC_PARSE_VERSION
        select USE_GENERIC_SMP_HELPERS if SMP
        select GENERIC_IRQ_SHOW
        select ARCH_WANT_IPC_PARSE_VERSION
        select USE_GENERIC_SMP_HELPERS if SMP

diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 932fa14de5fe7ddac20b4c9c4b418731c8f84847..8a7cc663b3f85b479a14cdf03b3c757c948cc660 100644 (file)
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -11,7 +11,6 @@ config TILE
        select USE_GENERIC_SMP_HELPERS
        select CC_OPTIMIZE_FOR_SIZE
        select HAVE_DEBUG_KMEMLEAK
        select USE_GENERIC_SMP_HELPERS
        select CC_OPTIMIZE_FOR_SIZE
        select HAVE_DEBUG_KMEMLEAK

-       select HAVE_GENERIC_HARDIRQS

        select GENERIC_IRQ_PROBE
        select GENERIC_PENDING_IRQ if SMP
        select GENERIC_IRQ_SHOW
        select GENERIC_IRQ_PROBE
        select GENERIC_PENDING_IRQ if SMP
        select GENERIC_IRQ_SHOW

diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
index bceee6623b00134023918cd5b62ec6144e3c66eb..8ddea1f8006a5a0732a3550ff6a5883aabd7fdec 100644 (file)
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@ -6,7 +6,6 @@ config DEFCONFIG_LIST
 config UML
        bool
        default y
 config UML
        bool
        default y

-       select HAVE_GENERIC_HARDIRQS

        select HAVE_UID16
        select GENERIC_IRQ_SHOW
        select GENERIC_CPU_DEVICES
        select HAVE_UID16
        select GENERIC_IRQ_SHOW
        select GENERIC_CPU_DEVICES

diff --git a/arch/um/defconfig b/arch/um/defconfig
index 08107a795062c55b0e9633bdd0b2da02351e96c4..2665e6b683f5dbca8de227aeb0d97cccac49803c 100644 (file)
--- a/arch/um/defconfig
+++ b/arch/um/defconfig
@@ -129,12 +129,10 @@ CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_FHANDLE is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_FHANDLE is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set

-CONFIG_HAVE_GENERIC_HARDIRQS=y

 
 #
 # IRQ subsystem
 #
 
 #
 # IRQ subsystem
 #

-CONFIG_GENERIC_HARDIRQS=y

 CONFIG_GENERIC_IRQ_SHOW=y
 
 #
 CONFIG_GENERIC_IRQ_SHOW=y
 
 #

diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index 41bcc001344201b7487fc339264c1a513026a5dc..82cdd8906f3d6ff70e3317a78ae00c08a0bed39e 100644 (file)
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -2,7 +2,6 @@ config UNICORE32
        def_bool y
        select HAVE_MEMBLOCK
        select HAVE_GENERIC_DMA_COHERENT
        def_bool y
        select HAVE_MEMBLOCK
        select HAVE_GENERIC_DMA_COHERENT

-       select HAVE_GENERIC_HARDIRQS

        select HAVE_DMA_ATTRS
        select HAVE_KERNEL_GZIP
        select HAVE_KERNEL_BZIP2
        select HAVE_DMA_ATTRS
        select HAVE_KERNEL_GZIP
        select HAVE_KERNEL_BZIP2

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 30c40f08a3d461346b06d4a8ebc7fa5acae121bf..e241a1930c9898003ed8f6097f2bb47208c8b4cd 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -82,7 +82,6 @@ config X86
        select HAVE_USER_RETURN_NOTIFIER
        select ARCH_BINFMT_ELF_RANDOMIZE_PIE
        select HAVE_ARCH_JUMP_LABEL
        select HAVE_USER_RETURN_NOTIFIER
        select ARCH_BINFMT_ELF_RANDOMIZE_PIE
        select HAVE_ARCH_JUMP_LABEL

-       select HAVE_GENERIC_HARDIRQS

        select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
        select SPARSE_IRQ
        select GENERIC_FIND_FIRST_BIT
        select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
        select SPARSE_IRQ
        select GENERIC_FIND_FIRST_BIT

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 7ea6451a3a33207508660141670cafeb309c309e..8d24dcb7cdac6df122e6779080b5e31b234a6ee5 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -7,7 +7,6 @@ config XTENSA
        select HAVE_IDE
        select GENERIC_ATOMIC64
        select GENERIC_CLOCKEVENTS
        select HAVE_IDE
        select GENERIC_ATOMIC64
        select GENERIC_CLOCKEVENTS

-       select HAVE_GENERIC_HARDIRQS

        select VIRT_TO_BUS
        select GENERIC_IRQ_SHOW
        select GENERIC_CPU_DEVICES
        select VIRT_TO_BUS
        select GENERIC_IRQ_SHOW
        select GENERIC_CPU_DEVICES

diff --git a/arch/xtensa/configs/common_defconfig b/arch/xtensa/configs/common_defconfig
index a182a4e6d688085ed9f108642d763fe987110800..f6000fe05119a1a9ad5f79cff94c4516b106809d 100644 (file)
--- a/arch/xtensa/configs/common_defconfig
+++ b/arch/xtensa/configs/common_defconfig
@@ -8,7 +8,6 @@ CONFIG_XTENSA=y
 # CONFIG_UID16 is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_HAVE_DEC_LOCK=y
 # CONFIG_UID16 is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_HAVE_DEC_LOCK=y

-CONFIG_GENERIC_HARDIRQS=y

 
 #
 # Code maturity level options
 
 #
 # Code maturity level options

diff --git a/arch/xtensa/configs/iss_defconfig b/arch/xtensa/configs/iss_defconfig
index 77c52f80187a220cc1b6982d235d0055a779f208..4f233204faf99b751682308c22dab254f6798fa7 100644 (file)
--- a/arch/xtensa/configs/iss_defconfig
+++ b/arch/xtensa/configs/iss_defconfig
@@ -9,7 +9,6 @@ CONFIG_XTENSA=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y

-CONFIG_GENERIC_HARDIRQS=y

 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_NO_IOPORT=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_NO_IOPORT=y

diff --git a/arch/xtensa/configs/s6105_defconfig b/arch/xtensa/configs/s6105_defconfig
index 4799c6a526b582658af0ebf34ffc08132b42dacf..d929f77a0360629e599079048eab6061fa1ac5e8 100644 (file)
--- a/arch/xtensa/configs/s6105_defconfig
+++ b/arch/xtensa/configs/s6105_defconfig
@@ -9,7 +9,6 @@ CONFIG_XTENSA=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y

-CONFIG_GENERIC_HARDIRQS=y

 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_NO_IOPORT=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_NO_IOPORT=y

diff --git a/drivers/block/mtip32xx/Kconfig b/drivers/block/mtip32xx/Kconfig
index 1fca1f996b45e478f781da6b4414b57e90181d3e..0ba837fc62a874511a910dd077feea2f26dfbd37 100644 (file)
--- a/drivers/block/mtip32xx/Kconfig
+++ b/drivers/block/mtip32xx/Kconfig
@@ -4,6 +4,6 @@
 
 config BLK_DEV_PCIESSD_MTIP32XX
        tristate "Block Device Driver for Micron PCIe SSDs"
 
 config BLK_DEV_PCIESSD_MTIP32XX
        tristate "Block Device Driver for Micron PCIe SSDs"

-       depends on PCI && GENERIC_HARDIRQS
+       depends on PCI

        help
           This enables the block driver for Micron PCIe SSDs.
        help
           This enables the block driver for Micron PCIe SSDs.

diff --git a/drivers/char/random.c b/drivers/char/random.c
index 0d91fe52f3f5eee10397563361a4b1dd1579e8cf..7737b5bd26af816e4361a906ad9d0cd6966b7287 100644 (file)
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -255,10 +255,7 @@
 #include <linux/fips.h>
 #include <linux/ptrace.h>
 #include <linux/kmemcheck.h>
 #include <linux/fips.h>
 #include <linux/ptrace.h>
 #include <linux/kmemcheck.h>

-
-#ifdef CONFIG_GENERIC_HARDIRQS
-# include <linux/irq.h>
-#endif
+#include <linux/irq.h>

 
 #include <asm/processor.h>
 #include <asm/uaccess.h>
 
 #include <asm/processor.h>
 #include <asm/uaccess.h>

diff --git a/drivers/dma/dw/Kconfig b/drivers/dma/dw/Kconfig
index dde13248b6818a00cae16afb5dae55d081592847..dcfe964cc8dc3138da6262fb6f453b3a421b45f7 100644 (file)
--- a/drivers/dma/dw/Kconfig
+++ b/drivers/dma/dw/Kconfig
@@ -4,7 +4,6 @@
 
 config DW_DMAC_CORE
        tristate "Synopsys DesignWare AHB DMA support"
 
 config DW_DMAC_CORE
        tristate "Synopsys DesignWare AHB DMA support"

-       depends on GENERIC_HARDIRQS

        select DMA_ENGINE
 
 config DW_DMAC
        select DMA_ENGINE
 
 config DW_DMAC

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 5cb218151c9c2c26c2c9f5f1880411a1c3c4dc68..b6ed304863eb97dc68e4afd0f35e359ca53903fd 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -322,7 +322,7 @@ config GPIO_ICH
 
 config GPIO_VX855
        tristate "VIA VX855/VX875 GPIO"
 
 config GPIO_VX855
        tristate "VIA VX855/VX875 GPIO"

-       depends on PCI && GENERIC_HARDIRQS
+       depends on PCI

        select MFD_CORE
        select MFD_VX855
        help
        select MFD_CORE
        select MFD_VX855
        help


@@ -396,7 +396,7 @@ config GPIO_MAX732X
 
 config GPIO_MAX732X_IRQ
        bool "Interrupt controller support for MAX732x"
 
 config GPIO_MAX732X_IRQ
        bool "Interrupt controller support for MAX732x"

-       depends on GPIO_MAX732X=y && GENERIC_HARDIRQS
+       depends on GPIO_MAX732X=y

        help
          Say yes here to enable the max732x to be used as an interrupt
          controller. It requires the driver to be built in the kernel.
        help
          Say yes here to enable the max732x to be used as an interrupt
          controller. It requires the driver to be built in the kernel.


@@ -661,7 +661,7 @@ config GPIO_TIMBERDALE
 
 config GPIO_RDC321X
        tristate "RDC R-321x GPIO support"
 
 config GPIO_RDC321X
        tristate "RDC R-321x GPIO support"

-       depends on PCI && GENERIC_HARDIRQS
+       depends on PCI

        select MFD_CORE
        select MFD_RDC321X
        help
        select MFD_CORE
        select MFD_RDC321X
        help

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 3d7c9f67b6d7631504b9fbaed82fff152e295bb0..71b70e3a7a7183068dbc18d3b224bf3894444497 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -773,7 +773,7 @@ config HID_ZYDACRON
 
 config HID_SENSOR_HUB
        tristate "HID Sensors framework support"
 
 config HID_SENSOR_HUB
        tristate "HID Sensors framework support"

-       depends on HID && GENERIC_HARDIRQS
+       depends on HID

        select MFD_CORE
        default n
        ---help---
        select MFD_CORE
        default n
        ---help---

diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index e380c6eef3af6500edc94b3a8db668bb59dfa258..7b7ea320a2588c9dfcfb107cbc6ab7f43e3e02c8 100644 (file)
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -75,7 +75,6 @@ config I2C_HELPER_AUTO
 
 config I2C_SMBUS
        tristate "SMBus-specific protocols" if !I2C_HELPER_AUTO
 
 config I2C_SMBUS
        tristate "SMBus-specific protocols" if !I2C_HELPER_AUTO

-       depends on GENERIC_HARDIRQS

        help
          Say Y here if you want support for SMBus extensions to the I2C
          specification. At the moment, the only supported extension is
        help
          Say Y here if you want support for SMBus extensions to the I2C
          specification. At the moment, the only supported extension is

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index fcdd321f709ecb2f284c3afefce962a2b1a8a42c..cdcbd8368ed344d205d7edb2edcdfe90919fd42f 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -115,7 +115,7 @@ config I2C_I801
 
 config I2C_ISCH
        tristate "Intel SCH SMBus 1.0"
 
 config I2C_ISCH
        tristate "Intel SCH SMBus 1.0"

-       depends on PCI && GENERIC_HARDIRQS
+       depends on PCI

        select LPC_SCH
        help
          Say Y here if you want to use SMBus controller on the Intel SCH
        select LPC_SCH
        help
          Say Y here if you want to use SMBus controller on the Intel SCH


@@ -546,7 +546,6 @@ config I2C_NUC900
 
 config I2C_OCORES
        tristate "OpenCores I2C Controller"
 
 config I2C_OCORES
        tristate "OpenCores I2C Controller"

-       depends on GENERIC_HARDIRQS

        help
          If you say yes to this option, support will be included for the
          OpenCores I2C controller. For details see
        help
          If you say yes to this option, support will be included for the
          OpenCores I2C controller. For details see


@@ -791,7 +790,7 @@ config I2C_DIOLAN_U2C
 
 config I2C_PARPORT
        tristate "Parallel port adapter"
 
 config I2C_PARPORT
        tristate "Parallel port adapter"

-       depends on PARPORT && GENERIC_HARDIRQS
+       depends on PARPORT

        select I2C_ALGOBIT
        select I2C_SMBUS
        help
        select I2C_ALGOBIT
        select I2C_SMBUS
        help


@@ -816,7 +815,6 @@ config I2C_PARPORT
 
 config I2C_PARPORT_LIGHT
        tristate "Parallel port adapter (light)"
 
 config I2C_PARPORT_LIGHT
        tristate "Parallel port adapter (light)"

-       depends on GENERIC_HARDIRQS

        select I2C_ALGOBIT
        select I2C_SMBUS
        help
        select I2C_ALGOBIT
        select I2C_SMBUS
        help

diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
index cbea3271c1b1a43e564392b0107ac40a6356bc02..90cf0cda50c49e8f5db63298f182dd50708d3e57 100644 (file)
--- a/drivers/iio/Kconfig
+++ b/drivers/iio/Kconfig
@@ -4,7 +4,6 @@
 
 menuconfig IIO
        tristate "Industrial I/O support"
 
 menuconfig IIO
        tristate "Industrial I/O support"

-       depends on GENERIC_HARDIRQS

        help
          The industrial I/O subsystem provides a unified framework for
          drivers for many different types of embedded sensors using a
        help
          The industrial I/O subsystem provides a unified framework for
          drivers for many different types of embedded sensors using a

diff --git a/drivers/infiniband/hw/qib/Kconfig b/drivers/infiniband/hw/qib/Kconfig
index d03ca4c1ff250d8345d5ebbda2c84d49a38a4ff4..495be09781b11e9baff1a181db5137b88f0b15d6 100644 (file)
--- a/drivers/infiniband/hw/qib/Kconfig
+++ b/drivers/infiniband/hw/qib/Kconfig
@@ -8,7 +8,7 @@ config INFINIBAND_QIB
 
 config INFINIBAND_QIB_DCA
        bool "QIB DCA support"
 
 config INFINIBAND_QIB_DCA
        bool "QIB DCA support"

-       depends on INFINIBAND_QIB && DCA && SMP && GENERIC_HARDIRQS && !(INFINIBAND_QIB=y && DCA=m)
+       depends on INFINIBAND_QIB && DCA && SMP && !(INFINIBAND_QIB=y && DCA=m)

        default y
        ---help---
        Setting this enables DCA support on some Intel chip sets
        default y
        ---help---
        Setting this enables DCA support on some Intel chip sets

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 269d4c3658cb062926972f9cae6ede7faa8d9522..c1edd39bc5ba1c1c39c81cd895f3e3ab8cbb5c01 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -224,7 +224,7 @@ config KEYBOARD_TCA6416
 
 config KEYBOARD_TCA8418
        tristate "TCA8418 Keypad Support"
 
 config KEYBOARD_TCA8418
        tristate "TCA8418 Keypad Support"

-       depends on I2C && GENERIC_HARDIRQS
+       depends on I2C

        select INPUT_MATRIXKMAP
        help
          This driver implements basic keypad functionality
        select INPUT_MATRIXKMAP
        help
          This driver implements basic keypad functionality


@@ -303,7 +303,7 @@ config KEYBOARD_HP7XX
 
 config KEYBOARD_LM8323
        tristate "LM8323 keypad chip"
 
 config KEYBOARD_LM8323
        tristate "LM8323 keypad chip"

-       depends on I2C && GENERIC_HARDIRQS
+       depends on I2C

        depends on LEDS_CLASS
        help
          If you say yes here you get support for the National Semiconductor
        depends on LEDS_CLASS
        help
          If you say yes here you get support for the National Semiconductor

diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 1e691a3a79cbaffd054789bb4b7f586cff792bba..33b3e88fe4a2312f0047a4a700a2733c9ef81ee4 100644 (file)
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -239,7 +239,6 @@ config SERIO_PS2MULT
 
 config SERIO_ARC_PS2
        tristate "ARC PS/2 support"
 
 config SERIO_ARC_PS2
        tristate "ARC PS/2 support"

-       depends on GENERIC_HARDIRQS

        help
          Say Y here if you have an ARC FPGA platform with a PS/2
          controller in it.
        help
          Say Y here if you have an ARC FPGA platform with a PS/2
          controller in it.

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 3b9758b5f4d7addee5e5d5ec4e706b2421e1a4b7..e09ec67957a3c32b185dd451fedba467729d0b77 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -389,7 +389,7 @@ config TOUCHSCREEN_MCS5000
 
 config TOUCHSCREEN_MMS114
        tristate "MELFAS MMS114 touchscreen"
 
 config TOUCHSCREEN_MMS114
        tristate "MELFAS MMS114 touchscreen"

-       depends on I2C && GENERIC_HARDIRQS
+       depends on I2C

        help
          Say Y here if you have the MELFAS MMS114 touchscreen controller
          chip in your system.
        help
          Say Y here if you have the MELFAS MMS114 touchscreen controller
          chip in your system.


@@ -845,7 +845,7 @@ config TOUCHSCREEN_TSC_SERIO
 
 config TOUCHSCREEN_TSC2005
         tristate "TSC2005 based touchscreens"
 
 config TOUCHSCREEN_TSC2005
         tristate "TSC2005 based touchscreens"

-        depends on SPI_MASTER && GENERIC_HARDIRQS
+        depends on SPI_MASTER

         help
           Say Y here if you have a TSC2005 based touchscreen.
 
         help
           Say Y here if you have a TSC2005 based touchscreen.
 

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 8068d7b6415532183839f1281d3e6dbef5949098..c7caf94621b418b351f19c040267c98754e4a924 100644 (file)
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -203,7 +203,7 @@ config VIDEO_SAMSUNG_EXYNOS_GSC
 
 config VIDEO_SH_VEU
        tristate "SuperH VEU mem2mem video processing driver"
 
 config VIDEO_SH_VEU
        tristate "SuperH VEU mem2mem video processing driver"

-       depends on VIDEO_DEV && VIDEO_V4L2 && GENERIC_HARDIRQS && HAS_DMA
+       depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA

        select VIDEOBUF2_DMA_CONTIG
        select V4L2_MEM2MEM_DEV
        help
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_MEM2MEM_DEV
        help

diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index 39882ddd2594ffe5b3792f0f0b0a14ec1a2f10ec..6ecdc39bb366c66cdc5998ef37eca73092edb569 100644 (file)
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -214,7 +214,7 @@ config RADIO_TIMBERDALE
 
 config RADIO_WL1273
        tristate "Texas Instruments WL1273 I2C FM Radio"
 
 config RADIO_WL1273
        tristate "Texas Instruments WL1273 I2C FM Radio"

-       depends on I2C && VIDEO_V4L2 && GENERIC_HARDIRQS
+       depends on I2C && VIDEO_V4L2

        select MFD_CORE
        select MFD_WL1273_CORE
        select FW_LOADER
        select MFD_CORE
        select MFD_WL1273_CORE
        select FW_LOADER

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index e0e46f50f95d394642f740b111d91d5dce8431f6..914c3d142f789f0a517d32e59f53b457b61c2089 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -23,7 +23,7 @@ config MFD_AS3711
        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ
        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        help
          Support for the AS3711 PMIC from AMS
 
        help
          Support for the AS3711 PMIC from AMS
 


@@ -40,7 +40,7 @@ config PMIC_ADP5520
 config MFD_AAT2870_CORE
        bool "AnalogicTech AAT2870"
        select MFD_CORE
 config MFD_AAT2870_CORE
        bool "AnalogicTech AAT2870"
        select MFD_CORE

-       depends on I2C=y && GPIOLIB && GENERIC_HARDIRQS
+       depends on I2C=y && GPIOLIB

        help
          If you say yes here you get support for the AAT2870.
          This driver provides common support for accessing the device,
        help
          If you say yes here you get support for the AAT2870.
          This driver provides common support for accessing the device,


@@ -78,7 +78,7 @@ config MFD_CROS_EC_SPI
 
 config MFD_ASIC3
        bool "Compaq ASIC3"
 
 config MFD_ASIC3
        bool "Compaq ASIC3"

-       depends on GENERIC_HARDIRQS && GPIOLIB && ARM
+       depends on GPIOLIB && ARM

        select MFD_CORE
         ---help---
          This driver supports the ASIC3 multifunction chip found on many
        select MFD_CORE
         ---help---
          This driver supports the ASIC3 multifunction chip found on many


@@ -104,7 +104,7 @@ config MFD_DA9052_SPI
        select REGMAP_SPI
        select REGMAP_IRQ
        select PMIC_DA9052
        select REGMAP_SPI
        select REGMAP_IRQ
        select PMIC_DA9052

-       depends on SPI_MASTER=y && GENERIC_HARDIRQS
+       depends on SPI_MASTER=y

        help
          Support for the Dialog Semiconductor DA9052 PMIC
          when controlled using SPI. This driver provides common support
        help
          Support for the Dialog Semiconductor DA9052 PMIC
          when controlled using SPI. This driver provides common support


@@ -116,7 +116,7 @@ config MFD_DA9052_I2C
        select REGMAP_I2C
        select REGMAP_IRQ
        select PMIC_DA9052
        select REGMAP_I2C
        select REGMAP_IRQ
        select PMIC_DA9052

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        help
          Support for the Dialog Semiconductor DA9052 PMIC
          when controlled using I2C. This driver provides common support
        help
          Support for the Dialog Semiconductor DA9052 PMIC
          when controlled using I2C. This driver provides common support


@@ -128,7 +128,7 @@ config MFD_DA9055
        select REGMAP_I2C
        select REGMAP_IRQ
        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ
        select MFD_CORE

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        help
          Say yes here for support of Dialog Semiconductor DA9055. This is
          a Power Management IC. This driver provides common support for
        help
          Say yes here for support of Dialog Semiconductor DA9055. This is
          a Power Management IC. This driver provides common support for


@@ -144,7 +144,7 @@ config MFD_DA9063
        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ
        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        help
          Say yes here for support for the Dialog Semiconductor DA9063 PMIC.
          This includes the I2C driver and core APIs.
        help
          Say yes here for support for the Dialog Semiconductor DA9063 PMIC.
          This includes the I2C driver and core APIs.


@@ -156,7 +156,7 @@ config MFD_MC13783
 
 config MFD_MC13XXX
        tristate
 
 config MFD_MC13XXX
        tristate

-       depends on (SPI_MASTER || I2C) && GENERIC_HARDIRQS
+       depends on (SPI_MASTER || I2C)

        select MFD_CORE
        select MFD_MC13783
        help
        select MFD_CORE
        select MFD_MC13783
        help


@@ -167,7 +167,7 @@ config MFD_MC13XXX
 
 config MFD_MC13XXX_SPI
        tristate "Freescale MC13783 and MC13892 SPI interface"
 
 config MFD_MC13XXX_SPI
        tristate "Freescale MC13783 and MC13892 SPI interface"

-       depends on SPI_MASTER && GENERIC_HARDIRQS
+       depends on SPI_MASTER

        select REGMAP_SPI
        select MFD_MC13XXX
        help
        select REGMAP_SPI
        select MFD_MC13XXX
        help


@@ -175,7 +175,7 @@ config MFD_MC13XXX_SPI
 
 config MFD_MC13XXX_I2C
        tristate "Freescale MC13892 I2C interface"
 
 config MFD_MC13XXX_I2C
        tristate "Freescale MC13892 I2C interface"

-       depends on I2C && GENERIC_HARDIRQS
+       depends on I2C

        select REGMAP_I2C
        select MFD_MC13XXX
        help
        select REGMAP_I2C
        select MFD_MC13XXX
        help


@@ -183,7 +183,7 @@ config MFD_MC13XXX_I2C
 
 config HTC_EGPIO
        bool "HTC EGPIO support"
 
 config HTC_EGPIO
        bool "HTC EGPIO support"

-       depends on GENERIC_HARDIRQS && GPIOLIB && ARM
+       depends on GPIOLIB && ARM

        help
            This driver supports the CPLD egpio chip present on
            several HTC phones.  It provides basic support for input
        help
            This driver supports the CPLD egpio chip present on
            several HTC phones.  It provides basic support for input


@@ -192,7 +192,6 @@ config HTC_EGPIO
 config HTC_PASIC3
        tristate "HTC PASIC3 LED/DS1WM chip support"
        select MFD_CORE
 config HTC_PASIC3
        tristate "HTC PASIC3 LED/DS1WM chip support"
        select MFD_CORE

-       depends on GENERIC_HARDIRQS

        help
          This core driver provides register access for the LED/DS1WM
          chips labeled "AIC2" and "AIC3", found on HTC Blueangel and
        help
          This core driver provides register access for the LED/DS1WM
          chips labeled "AIC2" and "AIC3", found on HTC Blueangel and


@@ -210,7 +209,7 @@ config HTC_I2CPLD
 
 config LPC_ICH
        tristate "Intel ICH LPC"
 
 config LPC_ICH
        tristate "Intel ICH LPC"

-       depends on PCI && GENERIC_HARDIRQS
+       depends on PCI

        select MFD_CORE
        help
          The LPC bridge function of the Intel ICH provides support for
        select MFD_CORE
        help
          The LPC bridge function of the Intel ICH provides support for


@@ -220,7 +219,7 @@ config LPC_ICH
 
 config LPC_SCH
        tristate "Intel SCH LPC"
 
 config LPC_SCH
        tristate "Intel SCH LPC"

-       depends on PCI && GENERIC_HARDIRQS
+       depends on PCI

        select MFD_CORE
        help
          LPC bridge function of the Intel SCH provides support for
        select MFD_CORE
        help
          LPC bridge function of the Intel SCH provides support for


@@ -238,7 +237,7 @@ config MFD_INTEL_MSIC
 config MFD_JANZ_CMODIO
        tristate "Janz CMOD-IO PCI MODULbus Carrier Board"
        select MFD_CORE
 config MFD_JANZ_CMODIO
        tristate "Janz CMOD-IO PCI MODULbus Carrier Board"
        select MFD_CORE

-       depends on PCI && GENERIC_HARDIRQS
+       depends on PCI

        help
          This is the core driver for the Janz CMOD-IO PCI MODULbus
          carrier board. This device is a PCI to MODULbus bridge which may
        help
          This is the core driver for the Janz CMOD-IO PCI MODULbus
          carrier board. This device is a PCI to MODULbus bridge which may


@@ -277,7 +276,7 @@ config MFD_KEMPLD
 
 config MFD_88PM800
        tristate "Marvell 88PM800"
 
 config MFD_88PM800
        tristate "Marvell 88PM800"

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        select REGMAP_I2C
        select REGMAP_IRQ
        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ
        select MFD_CORE


@@ -289,7 +288,7 @@ config MFD_88PM800
 
 config MFD_88PM805
        tristate "Marvell 88PM805"
 
 config MFD_88PM805
        tristate "Marvell 88PM805"

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        select REGMAP_I2C
        select REGMAP_IRQ
        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ
        select MFD_CORE


@@ -301,7 +300,7 @@ config MFD_88PM805
 
 config MFD_88PM860X
        bool "Marvell 88PM8606/88PM8607"
 
 config MFD_88PM860X
        bool "Marvell 88PM8606/88PM8607"

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        select REGMAP_I2C
        select MFD_CORE
        help
        select REGMAP_I2C
        select MFD_CORE
        help


@@ -312,7 +311,7 @@ config MFD_88PM860X
 
 config MFD_MAX77686
        bool "Maxim Semiconductor MAX77686 PMIC Support"
 
 config MFD_MAX77686
        bool "Maxim Semiconductor MAX77686 PMIC Support"

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        select MFD_CORE
        select REGMAP_I2C
        select IRQ_DOMAIN
        select MFD_CORE
        select REGMAP_I2C
        select IRQ_DOMAIN


@@ -325,7 +324,7 @@ config MFD_MAX77686
 
 config MFD_MAX77693
        bool "Maxim Semiconductor MAX77693 PMIC Support"
 
 config MFD_MAX77693
        bool "Maxim Semiconductor MAX77693 PMIC Support"

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        select MFD_CORE
        select REGMAP_I2C
        help
        select MFD_CORE
        select REGMAP_I2C
        help


@@ -339,7 +338,7 @@ config MFD_MAX77693
 config MFD_MAX8907
        tristate "Maxim Semiconductor MAX8907 PMIC Support"
        select MFD_CORE
 config MFD_MAX8907
        tristate "Maxim Semiconductor MAX8907 PMIC Support"
        select MFD_CORE

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        select REGMAP_I2C
        select REGMAP_IRQ
        help
        select REGMAP_I2C
        select REGMAP_IRQ
        help


@@ -350,7 +349,7 @@ config MFD_MAX8907
 
 config MFD_MAX8925
        bool "Maxim Semiconductor MAX8925 PMIC Support"
 
 config MFD_MAX8925
        bool "Maxim Semiconductor MAX8925 PMIC Support"

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        select MFD_CORE
        help
          Say yes here to support for Maxim Semiconductor MAX8925. This is
        select MFD_CORE
        help
          Say yes here to support for Maxim Semiconductor MAX8925. This is


@@ -360,7 +359,7 @@ config MFD_MAX8925
 
 config MFD_MAX8997
        bool "Maxim Semiconductor MAX8997/8966 PMIC Support"
 
 config MFD_MAX8997
        bool "Maxim Semiconductor MAX8997/8966 PMIC Support"

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        select MFD_CORE
        select IRQ_DOMAIN
        help
        select MFD_CORE
        select IRQ_DOMAIN
        help


@@ -373,7 +372,7 @@ config MFD_MAX8997
 
 config MFD_MAX8998
        bool "Maxim Semiconductor MAX8998/National LP3974 PMIC Support"
 
 config MFD_MAX8998
        bool "Maxim Semiconductor MAX8998/National LP3974 PMIC Support"

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        select MFD_CORE
        select IRQ_DOMAIN
        help
        select MFD_CORE
        select IRQ_DOMAIN
        help


@@ -385,7 +384,7 @@ config MFD_MAX8998
 
 config EZX_PCAP
        bool "Motorola EZXPCAP Support"
 
 config EZX_PCAP
        bool "Motorola EZXPCAP Support"

-       depends on GENERIC_HARDIRQS && SPI_MASTER
+       depends on SPI_MASTER

        help
          This enables the PCAP ASIC present on EZX Phones. This is
          needed for MMC, TouchScreen, Sound, USB, etc..
        help
          This enables the PCAP ASIC present on EZX Phones. This is
          needed for MMC, TouchScreen, Sound, USB, etc..


@@ -393,7 +392,7 @@ config EZX_PCAP
 config MFD_VIPERBOARD
         tristate "Nano River Technologies Viperboard"
        select MFD_CORE
 config MFD_VIPERBOARD
         tristate "Nano River Technologies Viperboard"
        select MFD_CORE

-       depends on USB && GENERIC_HARDIRQS
+       depends on USB

        default n
        help
          Say yes here if you want support for Nano River Technologies
        default n
        help
          Say yes here if you want support for Nano River Technologies


@@ -407,7 +406,7 @@ config MFD_VIPERBOARD
 config MFD_RETU
        tristate "Nokia Retu and Tahvo multi-function device"
        select MFD_CORE
 config MFD_RETU
        tristate "Nokia Retu and Tahvo multi-function device"
        select MFD_CORE

-       depends on I2C && GENERIC_HARDIRQS
+       depends on I2C

        select REGMAP_IRQ
        help
          Retu and Tahvo are a multi-function devices found on Nokia
        select REGMAP_IRQ
        help
          Retu and Tahvo are a multi-function devices found on Nokia


@@ -480,7 +479,7 @@ config MFD_PM8XXX_IRQ
 config MFD_RDC321X
        tristate "RDC R-321x southbridge"
        select MFD_CORE
 config MFD_RDC321X
        tristate "RDC R-321x southbridge"
        select MFD_CORE

-       depends on PCI && GENERIC_HARDIRQS
+       depends on PCI

        help
          Say yes here if you want to have support for the RDC R-321x SoC
          southbridge which provides access to GPIOs and Watchdog using the
        help
          Say yes here if you want to have support for the RDC R-321x SoC
          southbridge which provides access to GPIOs and Watchdog using the


@@ -488,7 +487,7 @@ config MFD_RDC321X
 
 config MFD_RTSX_PCI
        tristate "Realtek PCI-E card reader"
 
 config MFD_RTSX_PCI
        tristate "Realtek PCI-E card reader"

-       depends on PCI && GENERIC_HARDIRQS
+       depends on PCI

        select MFD_CORE
        help
          This supports for Realtek PCI-Express card reader including rts5209,
        select MFD_CORE
        help
          This supports for Realtek PCI-Express card reader including rts5209,


@@ -498,7 +497,7 @@ config MFD_RTSX_PCI
 
 config MFD_RC5T583
        bool "Ricoh RC5T583 Power Management system device"
 
 config MFD_RC5T583
        bool "Ricoh RC5T583 Power Management system device"

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        select MFD_CORE
        select REGMAP_I2C
        help
        select MFD_CORE
        select REGMAP_I2C
        help


@@ -512,7 +511,7 @@ config MFD_RC5T583
 
 config MFD_SEC_CORE
        bool "SAMSUNG Electronics PMIC Series Support"
 
 config MFD_SEC_CORE
        bool "SAMSUNG Electronics PMIC Series Support"

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ
        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ


@@ -555,7 +554,7 @@ config MFD_SM501_GPIO
 
 config MFD_SMSC
        bool "SMSC ECE1099 series chips"
 
 config MFD_SMSC
        bool "SMSC ECE1099 series chips"

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        select MFD_CORE
        select REGMAP_I2C
        help
        select MFD_CORE
        select REGMAP_I2C
        help


@@ -577,7 +576,7 @@ config ABX500_CORE
 
 config AB3100_CORE
        bool "ST-Ericsson AB3100 Mixed Signal Circuit core functions"
 
 config AB3100_CORE
        bool "ST-Ericsson AB3100 Mixed Signal Circuit core functions"

-       depends on I2C=y && ABX500_CORE && GENERIC_HARDIRQS
+       depends on I2C=y && ABX500_CORE

        select MFD_CORE
        default y if ARCH_U300
        help
        select MFD_CORE
        default y if ARCH_U300
        help


@@ -601,7 +600,7 @@ config AB3100_OTP
 
 config AB8500_CORE
        bool "ST-Ericsson AB8500 Mixed Signal Power Management chip"
 
 config AB8500_CORE
        bool "ST-Ericsson AB8500 Mixed Signal Power Management chip"

-       depends on GENERIC_HARDIRQS && ABX500_CORE && MFD_DB8500_PRCMU
+       depends on ABX500_CORE && MFD_DB8500_PRCMU

        select POWER_SUPPLY
        select MFD_CORE
        select IRQ_DOMAIN
        select POWER_SUPPLY
        select MFD_CORE
        select IRQ_DOMAIN


@@ -639,7 +638,7 @@ config MFD_DB8500_PRCMU
 
 config MFD_STMPE
        bool "STMicroelectronics STMPE"
 
 config MFD_STMPE
        bool "STMicroelectronics STMPE"

-       depends on (I2C=y || SPI_MASTER=y) && GENERIC_HARDIRQS
+       depends on (I2C=y || SPI_MASTER=y)

        select MFD_CORE
        help
          Support for the STMPE family of I/O Expanders from
        select MFD_CORE
        help
          Support for the STMPE family of I/O Expanders from


@@ -680,7 +679,7 @@ endmenu
 
 config MFD_STA2X11
        bool "STMicroelectronics STA2X11"
 
 config MFD_STA2X11
        bool "STMicroelectronics STA2X11"

-       depends on STA2X11 && GENERIC_HARDIRQS
+       depends on STA2X11

        select MFD_CORE
        select REGMAP_MMIO
 
        select MFD_CORE
        select REGMAP_MMIO
 


@@ -700,7 +699,6 @@ config MFD_TI_AM335X_TSCADC
        select MFD_CORE
        select REGMAP
        select REGMAP_MMIO
        select MFD_CORE
        select REGMAP
        select REGMAP_MMIO

-       depends on GENERIC_HARDIRQS

        help
          If you say yes here you get support for Texas Instruments series
          of Touch Screen /ADC chips.
        help
          If you say yes here you get support for Texas Instruments series
          of Touch Screen /ADC chips.


@@ -717,7 +715,7 @@ config MFD_DM355EVM_MSP
 
 config MFD_LP8788
        bool "TI LP8788 Power Management Unit Driver"
 
 config MFD_LP8788
        bool "TI LP8788 Power Management Unit Driver"

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        select MFD_CORE
        select REGMAP_I2C
        select IRQ_DOMAIN
        select MFD_CORE
        select REGMAP_I2C
        select IRQ_DOMAIN


@@ -739,14 +737,14 @@ config MFD_PALMAS
        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ
        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        help
          If you say yes here you get support for the Palmas
          series of PMIC chips from Texas Instruments.
 
 config MFD_TI_SSP
        tristate "TI Sequencer Serial Port support"
        help
          If you say yes here you get support for the Palmas
          series of PMIC chips from Texas Instruments.
 
 config MFD_TI_SSP
        tristate "TI Sequencer Serial Port support"

-       depends on ARCH_DAVINCI_TNETV107X && GENERIC_HARDIRQS
+       depends on ARCH_DAVINCI_TNETV107X

        select MFD_CORE
        ---help---
          Say Y here if you want support for the Sequencer Serial Port
        select MFD_CORE
        ---help---
          Say Y here if you want support for the Sequencer Serial Port


@@ -761,7 +759,6 @@ config TPS6105X
        select REGULATOR
        select MFD_CORE
        select REGULATOR_FIXED_VOLTAGE
        select REGULATOR
        select MFD_CORE
        select REGULATOR_FIXED_VOLTAGE

-       depends on GENERIC_HARDIRQS

        help
          This option enables a driver for the TP61050/TPS61052
          high-power "white LED driver". This boost converter is
        help
          This option enables a driver for the TP61050/TPS61052
          high-power "white LED driver". This boost converter is


@@ -784,7 +781,7 @@ config TPS65010
 config TPS6507X
        tristate "TI TPS6507x Power Management / Touch Screen chips"
        select MFD_CORE
 config TPS6507X
        tristate "TI TPS6507x Power Management / Touch Screen chips"
        select MFD_CORE

-       depends on I2C && GENERIC_HARDIRQS
+       depends on I2C

        help
          If you say yes here you get support for the TPS6507x series of
          Power Management / Touch Screen chips.  These include voltage
        help
          If you say yes here you get support for the TPS6507x series of
          Power Management / Touch Screen chips.  These include voltage


@@ -798,7 +795,7 @@ config TPS65911_COMPARATOR
 
 config MFD_TPS65090
        bool "TI TPS65090 Power Management chips"
 
 config MFD_TPS65090
        bool "TI TPS65090 Power Management chips"

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ
        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ


@@ -811,7 +808,7 @@ config MFD_TPS65090
 
 config MFD_TPS65217
        tristate "TI TPS65217 Power Management / White LED chips"
 
 config MFD_TPS65217
        tristate "TI TPS65217 Power Management / White LED chips"

-       depends on I2C && GENERIC_HARDIRQS
+       depends on I2C

        select MFD_CORE
        select REGMAP_I2C
        help
        select MFD_CORE
        select REGMAP_I2C
        help


@@ -826,7 +823,7 @@ config MFD_TPS65217
 
 config MFD_TPS6586X
        bool "TI TPS6586x Power Management chips"
 
 config MFD_TPS6586X
        bool "TI TPS6586x Power Management chips"

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        select MFD_CORE
        select REGMAP_I2C
        help
        select MFD_CORE
        select REGMAP_I2C
        help


@@ -841,7 +838,7 @@ config MFD_TPS6586X
 
 config MFD_TPS65910
        bool "TI TPS65910 Power Management chip"
 
 config MFD_TPS65910
        bool "TI TPS65910 Power Management chip"

-       depends on I2C=y && GPIOLIB && GENERIC_HARDIRQS
+       depends on I2C=y && GPIOLIB

        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ
        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ


@@ -862,7 +859,7 @@ config MFD_TPS65912_I2C
        bool "TI TPS65912 Power Management chip with I2C"
        select MFD_CORE
        select MFD_TPS65912
        bool "TI TPS65912 Power Management chip with I2C"
        select MFD_CORE
        select MFD_TPS65912

-       depends on I2C=y && GPIOLIB && GENERIC_HARDIRQS
+       depends on I2C=y && GPIOLIB

        help
          If you say yes here you get support for the TPS65912 series of
          PM chips with I2C interface.
        help
          If you say yes here you get support for the TPS65912 series of
          PM chips with I2C interface.


@@ -871,14 +868,14 @@ config MFD_TPS65912_SPI
        bool "TI TPS65912 Power Management chip with SPI"
        select MFD_CORE
        select MFD_TPS65912
        bool "TI TPS65912 Power Management chip with SPI"
        select MFD_CORE
        select MFD_TPS65912

-       depends on SPI_MASTER && GPIOLIB && GENERIC_HARDIRQS
+       depends on SPI_MASTER && GPIOLIB

        help
          If you say yes here you get support for the TPS65912 series of
          PM chips with SPI interface.
 
 config MFD_TPS80031
        bool "TI TPS80031/TPS80032 Power Management chips"
        help
          If you say yes here you get support for the TPS65912 series of
          PM chips with SPI interface.
 
 config MFD_TPS80031
        bool "TI TPS80031/TPS80032 Power Management chips"

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ
        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ


@@ -892,7 +889,7 @@ config MFD_TPS80031
 
 config TWL4030_CORE
        bool "TI TWL4030/TWL5030/TWL6030/TPS659x0 Support"
 
 config TWL4030_CORE
        bool "TI TWL4030/TWL5030/TWL6030/TPS659x0 Support"

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        select IRQ_DOMAIN
        select REGMAP_I2C
        help
        select IRQ_DOMAIN
        select REGMAP_I2C
        help


@@ -931,13 +928,13 @@ config TWL4030_POWER
 
 config MFD_TWL4030_AUDIO
        bool "TI TWL4030 Audio"
 
 config MFD_TWL4030_AUDIO
        bool "TI TWL4030 Audio"

-       depends on TWL4030_CORE && GENERIC_HARDIRQS
+       depends on TWL4030_CORE

        select MFD_CORE
        default n
 
 config TWL6040_CORE
        bool "TI TWL6040 audio codec"
        select MFD_CORE
        default n
 
 config TWL6040_CORE
        bool "TI TWL6040 audio codec"

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ
        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ


@@ -961,7 +958,7 @@ config MENELAUS
 
 config MFD_WL1273_CORE
        tristate "TI WL1273 FM radio"
 
 config MFD_WL1273_CORE
        tristate "TI WL1273 FM radio"

-       depends on I2C && GENERIC_HARDIRQS
+       depends on I2C

        select MFD_CORE
        default n
        help
        select MFD_CORE
        default n
        help


@@ -974,7 +971,6 @@ config MFD_LM3533
        depends on I2C
        select MFD_CORE
        select REGMAP_I2C
        depends on I2C
        select MFD_CORE
        select REGMAP_I2C

-       depends on GENERIC_HARDIRQS

        help
          Say yes here to enable support for National Semiconductor / TI
          LM3533 Lighting Power chips.
        help
          Say yes here to enable support for National Semiconductor / TI
          LM3533 Lighting Power chips.


@@ -996,7 +992,7 @@ config MFD_TIMBERDALE
 
 config MFD_TC3589X
        bool "Toshiba TC35892 and variants"
 
 config MFD_TC3589X
        bool "Toshiba TC35892 and variants"

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        select MFD_CORE
        help
          Support for the Toshiba TC35892 and variants I/O Expander.
        select MFD_CORE
        help
          Support for the Toshiba TC35892 and variants I/O Expander.


@@ -1011,7 +1007,7 @@ config MFD_TMIO
 
 config MFD_T7L66XB
        bool "Toshiba T7L66XB"
 
 config MFD_T7L66XB
        bool "Toshiba T7L66XB"

-       depends on ARM && HAVE_CLK && GENERIC_HARDIRQS
+       depends on ARM && HAVE_CLK

        select MFD_CORE
        select MFD_TMIO
        help
        select MFD_CORE
        select MFD_TMIO
        help


@@ -1036,7 +1032,7 @@ config MFD_TC6393XB
 
 config MFD_VX855
        tristate "VIA VX855/VX875 integrated south bridge"
 
 config MFD_VX855
        tristate "VIA VX855/VX875 integrated south bridge"

-       depends on PCI && GENERIC_HARDIRQS
+       depends on PCI

        select MFD_CORE
        help
          Say yes here to enable support for various functions of the
        select MFD_CORE
        help
          Say yes here to enable support for various functions of the


@@ -1054,7 +1050,7 @@ config MFD_ARIZONA_I2C
        select MFD_ARIZONA
        select MFD_CORE
        select REGMAP_I2C
        select MFD_ARIZONA
        select MFD_CORE
        select REGMAP_I2C

-       depends on I2C && GENERIC_HARDIRQS
+       depends on I2C

        help
          Support for the Wolfson Microelectronics Arizona platform audio SoC
          core functionality controlled via I2C.
        help
          Support for the Wolfson Microelectronics Arizona platform audio SoC
          core functionality controlled via I2C.


@@ -1064,7 +1060,7 @@ config MFD_ARIZONA_SPI
        select MFD_ARIZONA
        select MFD_CORE
        select REGMAP_SPI
        select MFD_ARIZONA
        select MFD_CORE
        select REGMAP_SPI

-       depends on SPI_MASTER && GENERIC_HARDIRQS
+       depends on SPI_MASTER

        help
          Support for the Wolfson Microelectronics Arizona platform audio SoC
          core functionality controlled via I2C.
        help
          Support for the Wolfson Microelectronics Arizona platform audio SoC
          core functionality controlled via I2C.


@@ -1090,7 +1086,7 @@ config MFD_WM8997
 config MFD_WM8400
        bool "Wolfson Microelectronics WM8400"
        select MFD_CORE
 config MFD_WM8400
        bool "Wolfson Microelectronics WM8400"
        select MFD_CORE

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        select REGMAP_I2C
        help
          Support for the Wolfson Microelecronics WM8400 PMIC and audio
        select REGMAP_I2C
        help
          Support for the Wolfson Microelecronics WM8400 PMIC and audio


@@ -1100,7 +1096,6 @@ config MFD_WM8400
 
 config MFD_WM831X
        bool
 
 config MFD_WM831X
        bool

-       depends on GENERIC_HARDIRQS

 
 config MFD_WM831X_I2C
        bool "Wolfson Microelectronics WM831x/2x PMICs with I2C"
 
 config MFD_WM831X_I2C
        bool "Wolfson Microelectronics WM831x/2x PMICs with I2C"


@@ -1108,7 +1103,7 @@ config MFD_WM831X_I2C
        select MFD_WM831X
        select REGMAP_I2C
        select IRQ_DOMAIN
        select MFD_WM831X
        select REGMAP_I2C
        select IRQ_DOMAIN

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        help
          Support for the Wolfson Microelecronics WM831x and WM832x PMICs
          when controlled using I2C.  This driver provides common support
        help
          Support for the Wolfson Microelecronics WM831x and WM832x PMICs
          when controlled using I2C.  This driver provides common support


@@ -1121,7 +1116,7 @@ config MFD_WM831X_SPI
        select MFD_WM831X
        select REGMAP_SPI
        select IRQ_DOMAIN
        select MFD_WM831X
        select REGMAP_SPI
        select IRQ_DOMAIN

-       depends on SPI_MASTER && GENERIC_HARDIRQS
+       depends on SPI_MASTER

        help
          Support for the Wolfson Microelecronics WM831x and WM832x PMICs
          when controlled using SPI.  This driver provides common support
        help
          Support for the Wolfson Microelecronics WM831x and WM832x PMICs
          when controlled using SPI.  This driver provides common support


@@ -1130,12 +1125,11 @@ config MFD_WM831X_SPI
 
 config MFD_WM8350
        bool
 
 config MFD_WM8350
        bool

-       depends on GENERIC_HARDIRQS

 
 config MFD_WM8350_I2C
        bool "Wolfson Microelectronics WM8350 with I2C"
        select MFD_WM8350
 
 config MFD_WM8350_I2C
        bool "Wolfson Microelectronics WM8350 with I2C"
        select MFD_WM8350

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        help
          The WM8350 is an integrated audio and power management
          subsystem with watchdog and RTC functionality for embedded
        help
          The WM8350 is an integrated audio and power management
          subsystem with watchdog and RTC functionality for embedded


@@ -1148,7 +1142,7 @@ config MFD_WM8994
        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ
        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        help
          The WM8994 is a highly integrated hi-fi CODEC designed for
          smartphone applicatiosn.  As well as audio functionality it
        help
          The WM8994 is a highly integrated hi-fi CODEC designed for
          smartphone applicatiosn.  As well as audio functionality it

diff --git a/drivers/misc/cb710/Kconfig b/drivers/misc/cb710/Kconfig
index 5acb9c5b49c44e16ce57588ccc7fcd45af2cabe1..22429b8b1068e334e3640513f90ea2869ecdc068 100644 (file)
--- a/drivers/misc/cb710/Kconfig
+++ b/drivers/misc/cb710/Kconfig
@@ -1,6 +1,6 @@
 config CB710_CORE
        tristate "ENE CB710/720 Flash memory card reader support"
 config CB710_CORE
        tristate "ENE CB710/720 Flash memory card reader support"

-       depends on PCI && GENERIC_HARDIRQS
+       depends on PCI

        help
          This option enables support for PCI ENE CB710/720 Flash memory card
          reader found in some laptops (ie. some versions of HP Compaq nx9500).
        help
          This option enables support for PCI ENE CB710/720 Flash memory card
          reader found in some laptops (ie. some versions of HP Compaq nx9500).

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index b7fd5ab80a48d2dfe96e271d5768a38168342c7e..7fc5099e44b2ccf6c4b4164f37d1343d177e7d5e 100644 (file)
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -487,7 +487,7 @@ config MMC_SDHI
 
 config MMC_CB710
        tristate "ENE CB710 MMC/SD Interface support"
 
 config MMC_CB710
        tristate "ENE CB710 MMC/SD Interface support"

-       depends on PCI && GENERIC_HARDIRQS
+       depends on PCI

        select CB710_CORE
        help
          This option enables support for MMC/SD part of ENE CB710/720 Flash
        select CB710_CORE
        help
          This option enables support for MMC/SD part of ENE CB710/720 Flash

diff --git a/drivers/net/ethernet/cadence/Kconfig b/drivers/net/ethernet/cadence/Kconfig
index 8030cc0396fd22f1568fb0ded2eb3823b5bdd700..751d5c7b312dc39c32aba0636a0cc668ff946a44 100644 (file)
--- a/drivers/net/ethernet/cadence/Kconfig
+++ b/drivers/net/ethernet/cadence/Kconfig
@@ -22,7 +22,7 @@ if NET_CADENCE
 
 config ARM_AT91_ETHER
        tristate "AT91RM9200 Ethernet support"
 
 config ARM_AT91_ETHER
        tristate "AT91RM9200 Ethernet support"

-       depends on GENERIC_HARDIRQS && HAS_DMA
+       depends on HAS_DMA

        select MACB
        ---help---
          If you wish to compile a kernel for the AT91RM9200 and enable
        select MACB
        ---help---
          If you wish to compile a kernel for the AT91RM9200 and enable

diff --git a/drivers/net/wireless/p54/Kconfig b/drivers/net/wireless/p54/Kconfig
index 15ea36b51a668c6ae50543d0c5304a2bd0c12c45..cdafb8c73e82a74b8f8c0c54fbf7284a37495bd1 100644 (file)
--- a/drivers/net/wireless/p54/Kconfig
+++ b/drivers/net/wireless/p54/Kconfig
@@ -41,7 +41,7 @@ config P54_PCI
 
 config P54_SPI
        tristate "Prism54 SPI (stlc45xx) support"
 
 config P54_SPI
        tristate "Prism54 SPI (stlc45xx) support"

-       depends on P54_COMMON && SPI_MASTER && GENERIC_HARDIRQS
+       depends on P54_COMMON && SPI_MASTER

        ---help---
          This driver is for stlc4550 or stlc4560 based wireless chips
          such as Nokia's N800/N810 Portable Internet Tablet.
        ---help---
          This driver is for stlc4550 or stlc4560 based wireless chips
          such as Nokia's N800/N810 Portable Internet Tablet.

diff --git a/drivers/net/wireless/ti/wl1251/Kconfig b/drivers/net/wireless/ti/wl1251/Kconfig
index 8fec4ed36ac2ecae7824d00e6e79aa5b5b5880c0..477a206c098ef7157a53fba397d002062d5afbc0 100644 (file)
--- a/drivers/net/wireless/ti/wl1251/Kconfig
+++ b/drivers/net/wireless/ti/wl1251/Kconfig
@@ -1,6 +1,6 @@
 menuconfig WL1251
        tristate "TI wl1251 driver support"
 menuconfig WL1251
        tristate "TI wl1251 driver support"

-       depends on MAC80211 && GENERIC_HARDIRQS
+       depends on MAC80211

        select FW_LOADER
        select CRC7
        ---help---
        select FW_LOADER
        select CRC7
        ---help---

diff --git a/drivers/net/wireless/ti/wlcore/Kconfig b/drivers/net/wireless/ti/wlcore/Kconfig
index 2b832825c3d41130e3ed1c4802dc5c1244275634..7c099542b214796baa995b548f8453f339fde35f 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/Kconfig
+++ b/drivers/net/wireless/ti/wlcore/Kconfig
@@ -1,6 +1,6 @@
 config WLCORE
        tristate "TI wlcore support"
 config WLCORE
        tristate "TI wlcore support"

-       depends on WL_TI && GENERIC_HARDIRQS && MAC80211
+       depends on WL_TI && MAC80211

        select FW_LOADER
        ---help---
          This module contains the main code for TI WLAN chips.  It abstracts
        select FW_LOADER
        ---help---
          This module contains the main code for TI WLAN chips.  It abstracts

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index b35f93c232cf5d40390325f587a579aefc51f62b..d5f90d6383bc38660dcaba3786adcbf1e78a936b 100644 (file)
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -30,7 +30,6 @@ static int pci_msi_enable = 1;
 
 /* Arch hooks */
 
 
 /* Arch hooks */
 

-#if defined(CONFIG_GENERIC_HARDIRQS)

 int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)
 {
        struct msi_chip *chip = dev->bus->msi;
 int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)
 {
        struct msi_chip *chip = dev->bus->msi;


@@ -67,21 +66,6 @@ int __weak arch_msi_check_device(struct pci_dev *dev, int nvec, int type)
 
        return chip->check_device(chip, dev, nvec, type);
 }
 
        return chip->check_device(chip, dev, nvec, type);
 }

-#else
-int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)
-{
-       return -ENOSYS;
-}
-
-void __weak arch_teardown_msi_irq(unsigned int irq)
-{
-}
-
-int __weak arch_msi_check_device(struct pci_dev *dev, int nvec, int type)
-{
-       return 0;
-}
-#endif /* CONFIG_GENERIC_HARDIRQS */

 
 int __weak arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 {
 
 int __weak arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 {


@@ -245,8 +229,6 @@ static void msix_mask_irq(struct msi_desc *desc, u32 flag)
        desc->masked = __msix_mask_irq(desc, flag);
 }
 
        desc->masked = __msix_mask_irq(desc, flag);
 }
 

-#ifdef CONFIG_GENERIC_HARDIRQS
-

 static void msi_set_mask_bit(struct irq_data *data, u32 flag)
 {
        struct msi_desc *desc = irq_data_get_msi(data);
 static void msi_set_mask_bit(struct irq_data *data, u32 flag)
 {
        struct msi_desc *desc = irq_data_get_msi(data);


@@ -270,8 +252,6 @@ void unmask_msi_irq(struct irq_data *data)
        msi_set_mask_bit(data, 0);
 }
 
        msi_set_mask_bit(data, 0);
 }
 

-#endif /* CONFIG_GENERIC_HARDIRQS */
-

 void __read_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
 {
        BUG_ON(entry->dev->current_state != PCI_D0);
 void __read_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
 {
        BUG_ON(entry->dev->current_state != PCI_D0);


@@ -382,10 +362,8 @@ static void free_msi_irqs(struct pci_dev *dev)
                        nvec = entry->nvec_used;
                else
                        nvec = 1 << entry->msi_attrib.multiple;
                        nvec = entry->nvec_used;
                else
                        nvec = 1 << entry->msi_attrib.multiple;

-#ifdef CONFIG_GENERIC_HARDIRQS

                for (i = 0; i < nvec; i++)
                        BUG_ON(irq_has_action(entry->irq + i));
                for (i = 0; i < nvec; i++)
                        BUG_ON(irq_has_action(entry->irq + i));

-#endif

        }
 
        arch_teardown_msi_irqs(dev);
        }
 
        arch_teardown_msi_irqs(dev);

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index bb49ab684f9a73a8467176e545615ad35be0e32a..e6f92b450913e47c490b3481c4c33c537c2526bb 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -269,7 +269,6 @@ config CHARGER_ISP1704
 
 config CHARGER_MAX8903
        tristate "MAX8903 Battery DC-DC Charger for USB and Adapter Power"
 
 config CHARGER_MAX8903
        tristate "MAX8903 Battery DC-DC Charger for USB and Adapter Power"

-       depends on GENERIC_HARDIRQS

        help
          Say Y to enable support for the MAX8903 DC-DC charger and sysfs.
          The driver supports controlling charger-enable and current-limit
        help
          Say Y to enable support for the MAX8903 DC-DC charger and sysfs.
          The driver supports controlling charger-enable and current-limit


@@ -370,7 +369,7 @@ config AB8500_BM
 
 config BATTERY_GOLDFISH
        tristate "Goldfish battery driver"
 
 config BATTERY_GOLDFISH
        tristate "Goldfish battery driver"

-       depends on GENERIC_HARDIRQS && (GOLDFISH || COMPILE_TEST)
+       depends on GOLDFISH || COMPILE_TEST

        help
          Say Y to enable support for the battery and AC power in the
          Goldfish emulator.
        help
          Say Y to enable support for the battery and AC power in the
          Goldfish emulator.

diff --git a/drivers/pps/clients/Kconfig b/drivers/pps/clients/Kconfig
index 6efd9b60d8ff1aaeb9f2e3563096c070d24ab642..0c9f2805d076ee9633087fc246018c5758b71257 100644 (file)
--- a/drivers/pps/clients/Kconfig
+++ b/drivers/pps/clients/Kconfig
@@ -31,7 +31,7 @@ config PPS_CLIENT_PARPORT
 
 config PPS_CLIENT_GPIO
        tristate "PPS client using GPIO"
 
 config PPS_CLIENT_GPIO
        tristate "PPS client using GPIO"

-       depends on PPS && GENERIC_HARDIRQS
+       depends on PPS

        help
          If you say yes here you get support for a PPS source using
          GPIO. To be useful you must also register a platform device
        help
          If you say yes here you get support for a PPS source using
          GPIO. To be useful you must also register a platform device

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 0170d4c4a8a32aff8fceaa14e9705b07366ef980..b9c53cc40e1fa487dd3d73cd9c83d713a3334e6a 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -55,7 +55,6 @@ comment "SPI Master Controller Drivers"
 
 config SPI_ALTERA
        tristate "Altera SPI Controller"
 
 config SPI_ALTERA
        tristate "Altera SPI Controller"

-       depends on GENERIC_HARDIRQS

        select SPI_BITBANG
        help
          This is the driver for the Altera SPI Controller.
        select SPI_BITBANG
        help
          This is the driver for the Altera SPI Controller.


@@ -358,7 +357,7 @@ config SPI_PXA2XX_DMA
 
 config SPI_PXA2XX
        tristate "PXA2xx SSP SPI master"
 
 config SPI_PXA2XX
        tristate "PXA2xx SSP SPI master"

-       depends on (ARCH_PXA || PCI || ACPI) && GENERIC_HARDIRQS
+       depends on (ARCH_PXA || PCI || ACPI)

        select PXA_SSP if ARCH_PXA
        help
          This enables using a PXA2xx or Sodaville SSP port as a SPI master
        select PXA_SSP if ARCH_PXA
        help
          This enables using a PXA2xx or Sodaville SSP port as a SPI master

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 47c6e7b9e150fe4c579459915e8bd4bf85e64b33..febd45cd50273532e99c1a4d790d2690c6ae750d 100644 (file)
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -5,7 +5,7 @@
 if TTY
 
 menu "Serial drivers"
 if TTY
 
 menu "Serial drivers"

-       depends on HAS_IOMEM && GENERIC_HARDIRQS
+       depends on HAS_IOMEM

 
 source "drivers/tty/serial/8250/Kconfig"
 
 
 source "drivers/tty/serial/8250/Kconfig"
 

diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
index f969ea266acb854850d151c06294f29c330ca793..b870872e020f1e0bd8e93c157b76d145bc2b2122 100644 (file)
--- a/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@ -1,6 +1,6 @@
 config USB_DWC3
        tristate "DesignWare USB3 DRD Core Support"
 config USB_DWC3
        tristate "DesignWare USB3 DRD Core Support"

-       depends on (USB || USB_GADGET) && GENERIC_HARDIRQS && HAS_DMA
+       depends on (USB || USB_GADGET) && HAS_DMA

        depends on EXTCON
        select USB_XHCI_PLATFORM if USB_SUPPORT && USB_XHCI_HCD
        help
        depends on EXTCON
        select USB_XHCI_PLATFORM if USB_SUPPORT && USB_XHCI_HCD
        help

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 30e2dd8a1f2c42c87ed16aedf1d7f3bb9cefa104..48cddf3cd6b889b420d45da418e852ecd671d2c5 100644 (file)
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -313,7 +313,7 @@ config USB_S3C_HSUDC
 
 config USB_MV_UDC
        tristate "Marvell USB2.0 Device Controller"
 
 config USB_MV_UDC
        tristate "Marvell USB2.0 Device Controller"

-       depends on GENERIC_HARDIRQS && HAS_DMA
+       depends on HAS_DMA

        help
          Marvell Socs (including PXA and MMP series) include a high speed
          USB2.0 OTG controller, which can be configured as high speed or
        help
          Marvell Socs (including PXA and MMP series) include a high speed
          USB2.0 OTG controller, which can be configured as high speed or


@@ -425,7 +425,7 @@ config USB_GOKU
 
 config USB_EG20T
        tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7213/ML7831) UDC"
 
 config USB_EG20T
        tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7213/ML7831) UDC"

-       depends on PCI && GENERIC_HARDIRQS
+       depends on PCI

        help
          This is a USB device driver for EG20T PCH.
          EG20T PCH is the platform controller hub that is used in Intel's
        help
          This is a USB device driver for EG20T PCH.
          EG20T PCH is the platform controller hub that is used in Intel's

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 5be0326aae38f602fd41a15a2c52a3d40db0ebbc..b3f20d7f15dee9554ef9ef96acd735c3e3926064 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -278,7 +278,6 @@ endif # USB_EHCI_HCD
 
 config USB_OXU210HP_HCD
        tristate "OXU210HP HCD support"
 
 config USB_OXU210HP_HCD
        tristate "OXU210HP HCD support"

-       depends on GENERIC_HARDIRQS

        ---help---
          The OXU210HP is an USB host/OTG/device controller. Enable this
          option if your board has this chip. If unsure, say N.
        ---help---
          The OXU210HP is an USB host/OTG/device controller. Enable this
          option if your board has this chip. If unsure, say N.

diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index c64ee09a7c0e30ad4f36cde52e1dce98e4d128b4..c258a97ef1b0050f41e02d0a8e08b0052af488e7 100644 (file)
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -71,7 +71,6 @@ config USB_MUSB_DA8XX
 
 config USB_MUSB_TUSB6010
        tristate "TUSB6010"
 
 config USB_MUSB_TUSB6010
        tristate "TUSB6010"

-       depends on GENERIC_HARDIRQS

 
 config USB_MUSB_OMAP2PLUS
        tristate "OMAP2430 and onwards"
 
 config USB_MUSB_OMAP2PLUS
        tristate "OMAP2430 and onwards"

diff --git a/drivers/usb/renesas_usbhs/Kconfig b/drivers/usb/renesas_usbhs/Kconfig
index 019bf7e49ee6b1d2d64055326fdbf54589ff8b4f..1c4195abc1080295dcd145eb2519cc99b28f3c22 100644 (file)
--- a/drivers/usb/renesas_usbhs/Kconfig
+++ b/drivers/usb/renesas_usbhs/Kconfig
@@ -4,7 +4,7 @@
 
 config USB_RENESAS_USBHS
        tristate 'Renesas USBHS controller'
 
 config USB_RENESAS_USBHS
        tristate 'Renesas USBHS controller'

-       depends on USB_GADGET && GENERIC_HARDIRQS
+       depends on USB_GADGET

        default n
        help
          Renesas USBHS is a discrete USB host and peripheral controller chip
        default n
        help
          Renesas USBHS is a discrete USB host and peripheral controller chip

diff --git a/drivers/w1/masters/Kconfig b/drivers/w1/masters/Kconfig
index 2bd1257dcc1cb0a1809f544a884a3e1a3dbe9128..efc7f075fcbe2de8f09cbebbf4d0209b765379ed 100644 (file)
--- a/drivers/w1/masters/Kconfig
+++ b/drivers/w1/masters/Kconfig
@@ -42,7 +42,7 @@ config W1_MASTER_MXC
 
 config W1_MASTER_DS1WM
        tristate "Maxim DS1WM 1-wire busmaster"
 
 config W1_MASTER_DS1WM
        tristate "Maxim DS1WM 1-wire busmaster"

-       depends on W1 && GENERIC_HARDIRQS
+       depends on W1

        help
          Say Y here to enable the DS1WM 1-wire driver, such as that
          in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like
        help
          Say Y here to enable the DS1WM 1-wire driver, such as that
          in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like

diff --git a/include/linux/cpu_rmap.h b/include/linux/cpu_rmap.h
index 1739510d89943df23f193d5fb04332f47cdaf958..bdd18caa6c9473f4e9600a6cc5753aaa20523628 100644 (file)
--- a/include/linux/cpu_rmap.h
+++ b/include/linux/cpu_rmap.h
@@ -52,8 +52,6 @@ static inline void *cpu_rmap_lookup_obj(struct cpu_rmap *rmap, unsigned int cpu)
        return rmap->obj[rmap->near[cpu].index];
 }
 
        return rmap->obj[rmap->near[cpu].index];
 }
 

-#ifdef CONFIG_GENERIC_HARDIRQS
-

 /**
  * alloc_irq_cpu_rmap - allocate CPU affinity reverse-map for IRQs
  * @size: Number of objects to be mapped
 /**
  * alloc_irq_cpu_rmap - allocate CPU affinity reverse-map for IRQs
  * @size: Number of objects to be mapped


@@ -68,5 +66,4 @@ extern void free_irq_cpu_rmap(struct cpu_rmap *rmap);
 
 extern int irq_cpu_rmap_add(struct cpu_rmap *rmap, int irq);
 
 
 extern int irq_cpu_rmap_add(struct cpu_rmap *rmap, int irq);
 

-#endif

 #endif /* __LINUX_CPU_RMAP_H */
 #endif /* __LINUX_CPU_RMAP_H */

diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index ccfe17c5c8da1d78f62d652da8bb845d00dfc1f9..1e041063b22654aa375630bf36282d10059d7bec 100644 (file)
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@ -7,11 +7,7 @@
 #include <linux/vtime.h>
 
 
 #include <linux/vtime.h>
 
 

-#if defined(CONFIG_SMP) || defined(CONFIG_GENERIC_HARDIRQS)

 extern void synchronize_irq(unsigned int irq);
 extern void synchronize_irq(unsigned int irq);

-#else
-# define synchronize_irq(irq)  barrier()
-#endif

 
 #if defined(CONFIG_TINY_RCU)
 
 
 #if defined(CONFIG_TINY_RCU)
 

diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 5fa5afeeb7599d6c0f05d7fb59796cf153a614a9..5e865b55494096898112234b1f2898cfc372d757 100644 (file)
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -120,7 +120,6 @@ struct irqaction {
 
 extern irqreturn_t no_action(int cpl, void *dev_id);
 
 
 extern irqreturn_t no_action(int cpl, void *dev_id);
 

-#ifdef CONFIG_GENERIC_HARDIRQS

 extern int __must_check
 request_threaded_irq(unsigned int irq, irq_handler_t handler,
                     irq_handler_t thread_fn,
 extern int __must_check
 request_threaded_irq(unsigned int irq, irq_handler_t handler,
                     irq_handler_t thread_fn,


@@ -140,40 +139,6 @@ request_any_context_irq(unsigned int irq, irq_handler_t handler,
 extern int __must_check
 request_percpu_irq(unsigned int irq, irq_handler_t handler,
                   const char *devname, void __percpu *percpu_dev_id);
 extern int __must_check
 request_percpu_irq(unsigned int irq, irq_handler_t handler,
                   const char *devname, void __percpu *percpu_dev_id);

-#else
-
-extern int __must_check
-request_irq(unsigned int irq, irq_handler_t handler, unsigned long flags,
-           const char *name, void *dev);
-
-/*
- * Special function to avoid ifdeffery in kernel/irq/devres.c which
- * gets magically built by GENERIC_HARDIRQS=n architectures (sparc,
- * m68k). I really love these $@%#!* obvious Makefile references:
- * ../../../kernel/irq/devres.o
- */
-static inline int __must_check
-request_threaded_irq(unsigned int irq, irq_handler_t handler,
-                    irq_handler_t thread_fn,
-                    unsigned long flags, const char *name, void *dev)
-{
-       return request_irq(irq, handler, flags, name, dev);
-}
-
-static inline int __must_check
-request_any_context_irq(unsigned int irq, irq_handler_t handler,
-                       unsigned long flags, const char *name, void *dev_id)
-{
-       return request_irq(irq, handler, flags, name, dev_id);
-}
-
-static inline int __must_check
-request_percpu_irq(unsigned int irq, irq_handler_t handler,
-                  const char *devname, void __percpu *percpu_dev_id)
-{
-       return request_irq(irq, handler, 0, devname, percpu_dev_id);
-}
-#endif

 
 extern void free_irq(unsigned int, void *);
 extern void free_percpu_irq(unsigned int, void __percpu *);
 
 extern void free_irq(unsigned int, void *);
 extern void free_percpu_irq(unsigned int, void __percpu *);


@@ -221,7 +186,6 @@ extern void enable_irq(unsigned int irq);
 extern void enable_percpu_irq(unsigned int irq, unsigned int type);
 
 /* The following three functions are for the core kernel use only. */
 extern void enable_percpu_irq(unsigned int irq, unsigned int type);
 
 /* The following three functions are for the core kernel use only. */

-#ifdef CONFIG_GENERIC_HARDIRQS

 extern void suspend_device_irqs(void);
 extern void resume_device_irqs(void);
 #ifdef CONFIG_PM_SLEEP
 extern void suspend_device_irqs(void);
 extern void resume_device_irqs(void);
 #ifdef CONFIG_PM_SLEEP


@@ -229,13 +193,8 @@ extern int check_wakeup_irqs(void);
 #else
 static inline int check_wakeup_irqs(void) { return 0; }
 #endif
 #else
 static inline int check_wakeup_irqs(void) { return 0; }
 #endif

-#else
-static inline void suspend_device_irqs(void) { };
-static inline void resume_device_irqs(void) { };
-static inline int check_wakeup_irqs(void) { return 0; }
-#endif

 
 

-#if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)
+#if defined(CONFIG_SMP)

 
 extern cpumask_var_t irq_default_affinity;
 
 
 extern cpumask_var_t irq_default_affinity;
 


@@ -287,9 +246,8 @@ static inline int irq_set_affinity_hint(unsigned int irq,
 {
        return -EINVAL;
 }
 {
        return -EINVAL;
 }

-#endif /* CONFIG_SMP && CONFIG_GENERIC_HARDIRQS */
+#endif /* CONFIG_SMP */

 
 

-#ifdef CONFIG_GENERIC_HARDIRQS

 /*
  * Special lockdep variants of irq disabling/enabling.
  * These should be used for locking constructs that
 /*
  * Special lockdep variants of irq disabling/enabling.
  * These should be used for locking constructs that


@@ -354,33 +312,6 @@ static inline int disable_irq_wake(unsigned int irq)
        return irq_set_irq_wake(irq, 0);
 }
 
        return irq_set_irq_wake(irq, 0);
 }
 

-#else /* !CONFIG_GENERIC_HARDIRQS */
-/*
- * NOTE: non-genirq architectures, if they want to support the lock
- * validator need to define the methods below in their asm/irq.h
- * files, under an #ifdef CONFIG_LOCKDEP section.
- */
-#ifndef CONFIG_LOCKDEP
-#  define disable_irq_nosync_lockdep(irq)      disable_irq_nosync(irq)
-#  define disable_irq_nosync_lockdep_irqsave(irq, flags) \
-                                               disable_irq_nosync(irq)
-#  define disable_irq_lockdep(irq)             disable_irq(irq)
-#  define enable_irq_lockdep(irq)              enable_irq(irq)
-#  define enable_irq_lockdep_irqrestore(irq, flags) \
-                                               enable_irq(irq)
-# endif
-
-static inline int enable_irq_wake(unsigned int irq)
-{
-       return 0;
-}
-
-static inline int disable_irq_wake(unsigned int irq)
-{
-       return 0;
-}
-#endif /* CONFIG_GENERIC_HARDIRQS */
-

 
 #ifdef CONFIG_IRQ_FORCED_THREADING
 extern bool force_irqthreads;
 
 #ifdef CONFIG_IRQ_FORCED_THREADING
 extern bool force_irqthreads;


@@ -655,7 +586,7 @@ void tasklet_hrtimer_cancel(struct tasklet_hrtimer *ttimer)
  * if more than one irq occurred.
  */
 
  * if more than one irq occurred.
  */
 

-#if defined(CONFIG_GENERIC_HARDIRQS) && !defined(CONFIG_GENERIC_IRQ_PROBE) 
+#if !defined(CONFIG_GENERIC_IRQ_PROBE) 

 static inline unsigned long probe_irq_on(void)
 {
        return 0;
 static inline unsigned long probe_irq_on(void)
 {
        return 0;

diff --git a/include/linux/irq.h b/include/linux/irq.h
index f04d3ba335cb3ec778bd9820dc13dad29c2a8e72..56bb0dc8b7d44cbab1a5a3cefb9efc04a7440995 100644 (file)
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -382,8 +382,6 @@ extern void irq_cpu_online(void);
 extern void irq_cpu_offline(void);
 extern int __irq_set_affinity_locked(struct irq_data *data,  const struct cpumask *cpumask);
 
 extern void irq_cpu_offline(void);
 extern int __irq_set_affinity_locked(struct irq_data *data,  const struct cpumask *cpumask);
 

-#ifdef CONFIG_GENERIC_HARDIRQS
-

 #if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_PENDING_IRQ)
 void irq_move_irq(struct irq_data *data);
 void irq_move_masked_irq(struct irq_data *data);
 #if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_PENDING_IRQ)
 void irq_move_irq(struct irq_data *data);
 void irq_move_masked_irq(struct irq_data *data);


@@ -802,11 +800,4 @@ static inline void irq_gc_lock(struct irq_chip_generic *gc) { }
 static inline void irq_gc_unlock(struct irq_chip_generic *gc) { }
 #endif
 
 static inline void irq_gc_unlock(struct irq_chip_generic *gc) { }
 #endif
 

-#else /* !CONFIG_GENERIC_HARDIRQS */
-
-extern struct msi_desc *irq_get_msi_desc(unsigned int irq);
-extern int irq_set_msi_desc(unsigned int irq, struct msi_desc *entry);
-
-#endif /* CONFIG_GENERIC_HARDIRQS */
-

 #endif /* _LINUX_IRQ_H */
 #endif /* _LINUX_IRQ_H */

diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
index 623325e2ff97d4f0e3ead2d1eeeeddd35c1916fa..56fb646909dce8ddd749c207eb1cfe7a2481790c 100644 (file)
--- a/include/linux/irqdesc.h
+++ b/include/linux/irqdesc.h
@@ -76,8 +76,6 @@ struct irq_desc {
 extern struct irq_desc irq_desc[NR_IRQS];
 #endif
 
 extern struct irq_desc irq_desc[NR_IRQS];
 #endif
 

-#ifdef CONFIG_GENERIC_HARDIRQS
-

 static inline struct irq_data *irq_desc_get_irq_data(struct irq_desc *desc)
 {
        return &desc->irq_data;
 static inline struct irq_data *irq_desc_get_irq_data(struct irq_desc *desc)
 {
        return &desc->irq_data;


@@ -173,6 +171,5 @@ __irq_set_preflow_handler(unsigned int irq, irq_preflow_handler_t handler)
        desc->preflow_handler = handler;
 }
 #endif
        desc->preflow_handler = handler;
 }
 #endif

-#endif

 
 #endif
 
 #endif

diff --git a/include/linux/irqnr.h b/include/linux/irqnr.h
index 0a2dc46cdaf6e7070dc602fcde64a23c72553361..fdd5cc16c9c43bcf4bb72cbd7c18d2047af7dd7c 100644 (file)
--- a/include/linux/irqnr.h
+++ b/include/linux/irqnr.h
@@ -4,23 +4,6 @@
 #include <uapi/linux/irqnr.h>
 
 
 #include <uapi/linux/irqnr.h>
 
 

-#ifndef CONFIG_GENERIC_HARDIRQS
-#include <asm/irq.h>
-
-/*
- * Wrappers for non-genirq architectures:
- */
-#define nr_irqs                        NR_IRQS
-#define irq_to_desc(irq)       (&irq_desc[irq])
-
-# define for_each_irq_desc(irq, desc)          \
-       for (irq = 0; irq < nr_irqs; irq++)
-
-# define for_each_irq_desc_reverse(irq, desc)                          \
-       for (irq = nr_irqs - 1; irq >= 0; irq--)
-
-#else /* CONFIG_GENERIC_HARDIRQS */
-

 extern int nr_irqs;
 extern struct irq_desc *irq_to_desc(unsigned int irq);
 unsigned int irq_get_next_irq(unsigned int offset);
 extern int nr_irqs;
 extern struct irq_desc *irq_to_desc(unsigned int irq);
 unsigned int irq_get_next_irq(unsigned int offset);


@@ -50,8 +33,6 @@ unsigned int irq_get_next_irq(unsigned int offset);
        for (irq = irq_get_next_irq(0); irq < nr_irqs;  \
             irq = irq_get_next_irq(irq + 1))
 
        for (irq = irq_get_next_irq(0); irq < nr_irqs;  \
             irq = irq_get_next_irq(irq + 1))
 

-#endif /* CONFIG_GENERIC_HARDIRQS */
-

 #define for_each_irq_nr(irq)                   \
        for (irq = 0; irq < nr_irqs; irq++)
 
 #define for_each_irq_nr(irq)                   \
        for (irq = 0; irq < nr_irqs; irq++)
 

diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h
index ed5f6ed6eb772797ea1c7eb0e98e46f55dbcf027..51c72be4a7c3f1782a5d5f21801b06bea1720f57 100644 (file)
--- a/include/linux/kernel_stat.h
+++ b/include/linux/kernel_stat.h
@@ -36,9 +36,6 @@ struct kernel_cpustat {
 };
 
 struct kernel_stat {
 };
 
 struct kernel_stat {

-#ifndef CONFIG_GENERIC_HARDIRQS
-       unsigned int irqs[NR_IRQS];
-#endif

        unsigned long irqs_sum;
        unsigned int softirqs[NR_SOFTIRQS];
 };
        unsigned long irqs_sum;
        unsigned int softirqs[NR_SOFTIRQS];
 };


@@ -54,22 +51,6 @@ DECLARE_PER_CPU(struct kernel_cpustat, kernel_cpustat);
 
 extern unsigned long long nr_context_switches(void);
 
 
 extern unsigned long long nr_context_switches(void);
 

-#ifndef CONFIG_GENERIC_HARDIRQS
-
-struct irq_desc;
-
-static inline void kstat_incr_irqs_this_cpu(unsigned int irq,
-                                           struct irq_desc *desc)
-{
-       __this_cpu_inc(kstat.irqs[irq]);
-       __this_cpu_inc(kstat.irqs_sum);
-}
-
-static inline unsigned int kstat_irqs_cpu(unsigned int irq, int cpu)
-{
-       return kstat_cpu(cpu).irqs[irq];
-}
-#else

 #include <linux/irq.h>
 extern unsigned int kstat_irqs_cpu(unsigned int irq, int cpu);
 
 #include <linux/irq.h>
 extern unsigned int kstat_irqs_cpu(unsigned int irq, int cpu);
 


@@ -79,8 +60,6 @@ do {                                                  \
        __this_cpu_inc(kstat.irqs_sum);                 \
 } while (0)
 
        __this_cpu_inc(kstat.irqs_sum);                 \
 } while (0)
 

-#endif
-

 static inline void kstat_incr_softirqs_this_cpu(unsigned int irq)
 {
        __this_cpu_inc(kstat.softirqs[irq]);
 static inline void kstat_incr_softirqs_this_cpu(unsigned int irq)
 {
        __this_cpu_inc(kstat.softirqs[irq]);


@@ -94,20 +73,7 @@ static inline unsigned int kstat_softirqs_cpu(unsigned int irq, int cpu)
 /*
  * Number of interrupts per specific IRQ source, since bootup
  */
 /*
  * Number of interrupts per specific IRQ source, since bootup
  */

-#ifndef CONFIG_GENERIC_HARDIRQS
-static inline unsigned int kstat_irqs(unsigned int irq)
-{
-       unsigned int sum = 0;
-       int cpu;
-
-       for_each_possible_cpu(cpu)
-               sum += kstat_irqs_cpu(irq, cpu);
-
-       return sum;
-}
-#else

 extern unsigned int kstat_irqs(unsigned int irq);
 extern unsigned int kstat_irqs(unsigned int irq);

-#endif

 
 /*
  * Number of interrupts per cpu, since bootup
 
 /*
  * Number of interrupts per cpu, since bootup

diff --git a/kernel/Makefile b/kernel/Makefile
index 35ef1185e359457323d5513b578185ad16435bc2..1ce47553fb020e97e2a930309242c2c1e5161437 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -26,6 +26,7 @@ obj-y += sched/
 obj-y += power/
 obj-y += printk/
 obj-y += cpu/
 obj-y += power/
 obj-y += printk/
 obj-y += cpu/

+obj-y += irq/

 
 obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o
 obj-$(CONFIG_FREEZER) += freezer.o
 
 obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o
 obj-$(CONFIG_FREEZER) += freezer.o


@@ -79,7 +80,6 @@ obj-$(CONFIG_KPROBES) += kprobes.o
 obj-$(CONFIG_KGDB) += debug/
 obj-$(CONFIG_DETECT_HUNG_TASK) += hung_task.o
 obj-$(CONFIG_LOCKUP_DETECTOR) += watchdog.o
 obj-$(CONFIG_KGDB) += debug/
 obj-$(CONFIG_DETECT_HUNG_TASK) += hung_task.o
 obj-$(CONFIG_LOCKUP_DETECTOR) += watchdog.o

-obj-$(CONFIG_GENERIC_HARDIRQS) += irq/

 obj-$(CONFIG_SECCOMP) += seccomp.o
 obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o
 obj-$(CONFIG_TREE_RCU) += rcutree.o
 obj-$(CONFIG_SECCOMP) += seccomp.o
 obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o
 obj-$(CONFIG_TREE_RCU) += rcutree.o

diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig
index d1a758bc972afcb3f7c0103de781fa5720bea126..4a1fef09f658b894ea5eef6a55cff8f55b97dd0e 100644 (file)
--- a/kernel/irq/Kconfig
+++ b/kernel/irq/Kconfig
@@ -1,15 +1,4 @@
-# Select this to activate the generic irq options below
-config HAVE_GENERIC_HARDIRQS
-       bool
-
-if HAVE_GENERIC_HARDIRQS

 menu "IRQ subsystem"
 menu "IRQ subsystem"

-#
-# Interrupt subsystem related configuration options
-#
-config GENERIC_HARDIRQS
-       def_bool y
-

 # Options selectable by the architecture code
 
 # Make sparse irq Kconfig switch below available
 # Options selectable by the architecture code
 
 # Make sparse irq Kconfig switch below available


@@ -84,4 +73,3 @@ config SPARSE_IRQ
          If you don't know what to do here, say N.
 
 endmenu
          If you don't know what to do here, say N.
 
 endmenu

-endif

diff --git a/kernel/softirq.c b/kernel/softirq.c
index be3d3514c325f8aad38d62f65d2aee0393a70585..53cc09ceb0b869cf407fdc9d8195f265cce4c011 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -876,7 +876,6 @@ int __init __weak early_irq_init(void)
        return 0;
 }
 
        return 0;
 }
 

-#ifdef CONFIG_GENERIC_HARDIRQS

 int __init __weak arch_probe_nr_irqs(void)
 {
        return NR_IRQS_LEGACY;
 int __init __weak arch_probe_nr_irqs(void)
 {
        return NR_IRQS_LEGACY;


@@ -886,4 +885,3 @@ int __init __weak arch_early_irq_init(void)
 {
        return 0;
 }
 {
        return 0;
 }

-#endif

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index c9eef36739a90f54b442e616bc4b54d9e0dd21d5..06344d986eb9dde61f341057f431d3183301f54e 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -597,7 +597,7 @@ endmenu # "Memory Debugging"
 
 config DEBUG_SHIRQ
        bool "Debug shared IRQ handlers"
 
 config DEBUG_SHIRQ
        bool "Debug shared IRQ handlers"

-       depends on DEBUG_KERNEL && GENERIC_HARDIRQS
+       depends on DEBUG_KERNEL

        help
          Enable this to generate a spurious interrupt as soon as a shared
          interrupt handler is registered, and just before one is deregistered.
        help
          Enable this to generate a spurious interrupt as soon as a shared
          interrupt handler is registered, and just before one is deregistered.

diff --git a/lib/cpu_rmap.c b/lib/cpu_rmap.c
index 5fbed5caba6e833222a62952cb4ba6e3430c053e..4f134d8907a7d03760877bfa41a3a10e7747913f 100644 (file)
--- a/lib/cpu_rmap.c
+++ b/lib/cpu_rmap.c
@@ -8,9 +8,7 @@
  */
 
 #include <linux/cpu_rmap.h>
  */
 
 #include <linux/cpu_rmap.h>

-#ifdef CONFIG_GENERIC_HARDIRQS

 #include <linux/interrupt.h>
 #include <linux/interrupt.h>

-#endif

 #include <linux/export.h>
 
 /*
 #include <linux/export.h>
 
 /*


@@ -213,8 +211,6 @@ int cpu_rmap_update(struct cpu_rmap *rmap, u16 index,
 }
 EXPORT_SYMBOL(cpu_rmap_update);
 
 }
 EXPORT_SYMBOL(cpu_rmap_update);
 

-#ifdef CONFIG_GENERIC_HARDIRQS
-

 /* Glue between IRQ affinity notifiers and CPU rmaps */
 
 struct irq_glue {
 /* Glue between IRQ affinity notifiers and CPU rmaps */
 
 struct irq_glue {


@@ -309,5 +305,3 @@ int irq_cpu_rmap_add(struct cpu_rmap *rmap, int irq)
        return rc;
 }
 EXPORT_SYMBOL(irq_cpu_rmap_add);
        return rc;
 }
 EXPORT_SYMBOL(irq_cpu_rmap_add);

-
-#endif /* CONFIG_GENERIC_HARDIRQS */

diff --git a/net/Kconfig b/net/Kconfig
index ee0213667272cc8eb5425af16921c69bee385311..b50dacc072f0026416490e534f7f6c14fa624724 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -228,7 +228,7 @@ config RPS
 
 config RFS_ACCEL
        boolean
 
 config RFS_ACCEL
        boolean

-       depends on RPS && GENERIC_HARDIRQS
+       depends on RPS

        select CPU_RMAP
        default y
 
        select CPU_RMAP
        default y
 

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 15106c045478e644719a73e76edb6ea795909ff1..b33b45dfceec54b205c512ca01638d947df56f66 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -107,7 +107,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_WM8782
        select SND_SOC_WM8804 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8900 if I2C
        select SND_SOC_WM8782
        select SND_SOC_WM8804 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8900 if I2C

-       select SND_SOC_WM8903 if I2C && GENERIC_HARDIRQS
+       select SND_SOC_WM8903 if I2C

        select SND_SOC_WM8904 if I2C
        select SND_SOC_WM8940 if I2C
        select SND_SOC_WM8955 if I2C
        select SND_SOC_WM8904 if I2C
        select SND_SOC_WM8940 if I2C
        select SND_SOC_WM8955 if I2C

diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index 9855dfc3e3ec86f726526540d3bf0446cca22cd5..2eea1840315d3448248109215f216d2f607c0b89 100644 (file)
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -63,7 +63,7 @@ config SND_SOC_SAMSUNG_SMDK_WM8580
 config SND_SOC_SAMSUNG_SMDK_WM8994
        tristate "SoC I2S Audio support for WM8994 on SMDK"
        depends on SND_SOC_SAMSUNG
 config SND_SOC_SAMSUNG_SMDK_WM8994
        tristate "SoC I2S Audio support for WM8994 on SMDK"
        depends on SND_SOC_SAMSUNG

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        select MFD_WM8994
        select SND_SOC_WM8994
        select SND_SAMSUNG_I2S
        select MFD_WM8994
        select SND_SOC_WM8994
        select SND_SAMSUNG_I2S


@@ -151,7 +151,7 @@ config SND_SOC_SMARTQ
 config SND_SOC_GONI_AQUILA_WM8994
        tristate "SoC I2S Audio support for AQUILA/GONI - WM8994"
        depends on SND_SOC_SAMSUNG && (MACH_GONI || MACH_AQUILA)
 config SND_SOC_GONI_AQUILA_WM8994
        tristate "SoC I2S Audio support for AQUILA/GONI - WM8994"
        depends on SND_SOC_SAMSUNG && (MACH_GONI || MACH_AQUILA)

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        select SND_SAMSUNG_I2S
        select MFD_WM8994
        select SND_SOC_WM8994
        select SND_SAMSUNG_I2S
        select MFD_WM8994
        select SND_SOC_WM8994


@@ -177,7 +177,7 @@ config SND_SOC_SMDK_WM8580_PCM
 config SND_SOC_SMDK_WM8994_PCM
        tristate "SoC PCM Audio support for WM8994 on SMDK"
        depends on SND_SOC_SAMSUNG
 config SND_SOC_SMDK_WM8994_PCM
        tristate "SoC PCM Audio support for WM8994 on SMDK"
        depends on SND_SOC_SAMSUNG

-       depends on I2C=y && GENERIC_HARDIRQS
+       depends on I2C=y

        select MFD_WM8994
        select SND_SOC_WM8994
        select SND_SAMSUNG_PCM
        select MFD_WM8994
        select SND_SOC_WM8994
        select SND_SAMSUNG_PCM