diff options
author | Rob Herring <rob.herring@calxeda.com> | 2012-01-25 21:02:40 -0500 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2012-01-25 21:37:42 -0500 |
commit | 2ed86b16eabe4efbf80cc725a8cbb5310746a2fc (patch) | |
tree | 3cd096ab3472991435de367f181a3964d8549801 /arch | |
parent | dcd6c92267155e70a94b3927bce681ce74b80d1f (diff) |
irq: make SPARSE_IRQ an optionally hidden option
On ARM, we don't want SPARSE_IRQ to be a user visible option. Make
SPARSE_IRQ visible based on MAY_HAVE_SPARSE_IRQ instead of depending
on HAVE_SPARSE_IRQ.
With this, SPARSE_IRQ is not visible on C6X and ARM.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Mark Salter <msalter@redhat.com>
Cc: Aurelien Jacquiot <a-jacquiot@ti.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-c6x-dev@linux-c6x.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-sh@vger.kernel.org
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/Kconfig | 1 | ||||
-rw-r--r-- | arch/c6x/Kconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/Kconfig | 2 | ||||
-rw-r--r-- | arch/sh/Kconfig | 2 | ||||
-rw-r--r-- | arch/x86/Kconfig | 1 |
5 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 24626b0419ee..30e7840498ce 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -28,7 +28,6 @@ config ARM | |||
28 | select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)) | 28 | select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)) |
29 | select HAVE_C_RECORDMCOUNT | 29 | select HAVE_C_RECORDMCOUNT |
30 | select HAVE_GENERIC_HARDIRQS | 30 | select HAVE_GENERIC_HARDIRQS |
31 | select HAVE_SPARSE_IRQ | ||
32 | select GENERIC_IRQ_SHOW | 31 | select GENERIC_IRQ_SHOW |
33 | select CPU_PM if (SUSPEND || CPU_IDLE) | 32 | select CPU_PM if (SUSPEND || CPU_IDLE) |
34 | select GENERIC_PCI_IOMAP | 33 | select GENERIC_PCI_IOMAP |
diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig index 26e67f0f0051..2f58c61e2812 100644 --- a/arch/c6x/Kconfig +++ b/arch/c6x/Kconfig | |||
@@ -11,7 +11,7 @@ config TMS320C6X | |||
11 | select HAVE_DMA_API_DEBUG | 11 | select HAVE_DMA_API_DEBUG |
12 | select HAVE_GENERIC_HARDIRQS | 12 | select HAVE_GENERIC_HARDIRQS |
13 | select HAVE_MEMBLOCK | 13 | select HAVE_MEMBLOCK |
14 | select HAVE_SPARSE_IRQ | 14 | select SPARSE_IRQ |
15 | select OF | 15 | select OF |
16 | select OF_EARLY_FLATTREE | 16 | select OF_EARLY_FLATTREE |
17 | 17 | ||
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 1919634a9b32..06c1cf0f24a6 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -133,7 +133,7 @@ config PPC | |||
133 | select HAVE_REGS_AND_STACK_ACCESS_API | 133 | select HAVE_REGS_AND_STACK_ACCESS_API |
134 | select HAVE_HW_BREAKPOINT if PERF_EVENTS && PPC_BOOK3S_64 | 134 | select HAVE_HW_BREAKPOINT if PERF_EVENTS && PPC_BOOK3S_64 |
135 | select HAVE_GENERIC_HARDIRQS | 135 | select HAVE_GENERIC_HARDIRQS |
136 | select HAVE_SPARSE_IRQ | 136 | select MAY_HAVE_SPARSE_IRQ |
137 | select IRQ_PER_CPU | 137 | select IRQ_PER_CPU |
138 | select GENERIC_IRQ_SHOW | 138 | select GENERIC_IRQ_SHOW |
139 | select GENERIC_IRQ_SHOW_LEVEL | 139 | select GENERIC_IRQ_SHOW_LEVEL |
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 3c8db65c89e5..21b82a8cca21 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -22,7 +22,7 @@ config SUPERH | |||
22 | select HAVE_SYSCALL_TRACEPOINTS | 22 | select HAVE_SYSCALL_TRACEPOINTS |
23 | select HAVE_REGS_AND_STACK_ACCESS_API | 23 | select HAVE_REGS_AND_STACK_ACCESS_API |
24 | select HAVE_GENERIC_HARDIRQS | 24 | select HAVE_GENERIC_HARDIRQS |
25 | select HAVE_SPARSE_IRQ | 25 | select MAY_HAVE_SPARSE_IRQ |
26 | select IRQ_FORCED_THREADING | 26 | select IRQ_FORCED_THREADING |
27 | select RTC_LIB | 27 | select RTC_LIB |
28 | select GENERIC_ATOMIC64 | 28 | select GENERIC_ATOMIC64 |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 864cc6e6ac8e..fb2da445945f 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -69,7 +69,6 @@ config X86 | |||
69 | select HAVE_ARCH_JUMP_LABEL | 69 | select HAVE_ARCH_JUMP_LABEL |
70 | select HAVE_TEXT_POKE_SMP | 70 | select HAVE_TEXT_POKE_SMP |
71 | select HAVE_GENERIC_HARDIRQS | 71 | select HAVE_GENERIC_HARDIRQS |
72 | select HAVE_SPARSE_IRQ | ||
73 | select SPARSE_IRQ | 72 | select SPARSE_IRQ |
74 | select GENERIC_FIND_FIRST_BIT | 73 | select GENERIC_FIND_FIRST_BIT |
75 | select GENERIC_IRQ_PROBE | 74 | select GENERIC_IRQ_PROBE |