diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-10 13:50:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-11 14:17:36 -0400 |
| commit | d84705969f898f294bc3fc32eca33580f14105bd (patch) | |
| tree | c59c7e835820c6bfb5a957f70e58fee1699a6b38 /arch/x86/Kconfig | |
| parent | 725c25819e4a0dafdcf42a5f31bc569341919c7c (diff) | |
| parent | 11494547b1754c4f3bd7f707ab869e2adf54d52f (diff) | |
Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B
Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/kernel/apic_64.c
arch/x86/kernel/setup.c
drivers/pci/intel-iommu.c
include/asm-x86/cpufeature.h
include/asm-x86/dma-mapping.h
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 0d7cdbbfc1ee..44d4f2130d01 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -1689,6 +1689,14 @@ config DMAR_FLOPPY_WA | |||
| 1689 | workaround will setup a 1:1 mapping for the first | 1689 | workaround will setup a 1:1 mapping for the first |
| 1690 | 16M to make floppy (an ISA device) work. | 1690 | 16M to make floppy (an ISA device) work. |
| 1691 | 1691 | ||
| 1692 | config INTR_REMAP | ||
| 1693 | bool "Support for Interrupt Remapping (EXPERIMENTAL)" | ||
| 1694 | depends on X86_64 && X86_IO_APIC && PCI_MSI && ACPI && EXPERIMENTAL | ||
| 1695 | help | ||
| 1696 | Supports Interrupt remapping for IO-APIC and MSI devices. | ||
| 1697 | To use x2apic mode in the CPU's which support x2APIC enhancements or | ||
| 1698 | to support platforms with CPU's having > 8 bit APIC ID, say Y. | ||
| 1699 | |||
| 1692 | source "drivers/pci/pcie/Kconfig" | 1700 | source "drivers/pci/pcie/Kconfig" |
| 1693 | 1701 | ||
| 1694 | source "drivers/pci/Kconfig" | 1702 | source "drivers/pci/Kconfig" |