diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-04 17:19:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-04 17:19:17 +0200 |
| commit | 317e258038da9b41aeb08b137ab5994a67809586 (patch) | |
| tree | 8c9e894d1f5564d54c8584cea98fb96dfaea6ecc /arch/x86 | |
| parent | 41f57edb98d12b04e2f16673c2f1156808bd81c5 (diff) | |
| parent | bd151412263a67b5321e9dd1d5b4bf6d96fdebf3 (diff) | |
Merge branch 'irq/core' into auto-latest
Conflicts:
arch/x86/Kconfig
include/linux/irq.h
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/Kconfig | 36 |
1 files changed, 5 insertions, 31 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index fa9825d28364..f6510b0b3b64 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -60,6 +60,11 @@ config X86 select ANON_INODES select HAVE_ARCH_KMEMCHECK select HAVE_USER_RETURN_NOTIFIER + select HAVE_GENERIC_HARDIRQS + select HAVE_SPARSE_IRQ + select NUMA_IRQ_DESC if (SPARSE_IRQ && NUMA) + select GENERIC_IRQ_PROBE + select GENERIC_PENDING_IRQ if SMP select HAVE_ARCH_JUMP_LABEL config INSTRUCTION_DECODER @@ -199,20 +204,6 @@ config HAVE_INTEL_TXT def_bool y depends on EXPERIMENTAL && DMAR && ACPI -# Use the generic interrupt handling code in kernel/irq/: -config GENERIC_HARDIRQS - def_bool y - -config GENERIC_HARDIRQS_NO__DO_IRQ - def_bool y - -config GENERIC_IRQ_PROBE - def_bool y - -config GENERIC_PENDING_IRQ - def_bool y - depends on GENERIC_HARDIRQS && SMP - config USE_GENERIC_SMP_HELPERS def_bool y depends on SMP @@ -295,23 +286,6 @@ config X86_X2APIC If you don't know what to do here, say N. -config SPARSE_IRQ - bool "Support sparse irq numbering" - depends on PCI_MSI || HT_IRQ - ---help--- - This enables support for sparse irqs. This is useful for distro - kernels that want to define a high CONFIG_NR_CPUS value but still - want to have low kernel memory footprint on smaller machines. - - ( Sparse IRQs can also be beneficial on NUMA boxes, as they spread - out the irq_desc[] array in a more NUMA-friendly way. ) - - If you don't know what to do here, say N. - -config NUMA_IRQ_DESC - def_bool y - depends on SPARSE_IRQ && NUMA - config X86_MPPARSE bool "Enable MPS table" if ACPI default y |