diff options
author | Jiang Liu <jiang.liu@linux.intel.com> | 2014-10-27 04:12:06 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-12-16 08:08:17 -0500 |
commit | 2f600025d38f8c4e7debdeae9b80b7df498c22be (patch) | |
tree | 433676a84f1a3e31051fcc84c811cd05cd21c8b6 | |
parent | 11d686e956d6db58e4cb96b30008d0a43ddd0ce3 (diff) |
x86, irq: Make MSI and HT_IRQ indepenent of X86_IO_APIC
Now we have splitted functions to support MSI and HT_IRQ into vector.c,
and they have no dependency on IOAPIC any more. So change Kconfig files
to make MSI and HT_IRQ independent of X86_IO_APIC.
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Link: http://lkml.kernel.org/r/1414397531-28254-16-git-send-email-jiang.liu@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | arch/x86/Kconfig | 4 | ||||
-rw-r--r-- | drivers/pci/Kconfig | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 1e851b1ff61b..a39b7e5e95b3 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -889,8 +889,8 @@ config X86_LOCAL_APIC | |||
889 | select GENERIC_IRQ_LEGACY_ALLOC_HWIRQ | 889 | select GENERIC_IRQ_LEGACY_ALLOC_HWIRQ |
890 | 890 | ||
891 | config X86_IO_APIC | 891 | config X86_IO_APIC |
892 | def_bool y | 892 | def_bool X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC |
893 | depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC || PCI_MSI | 893 | depends on X86_LOCAL_APIC |
894 | select IRQ_DOMAIN | 894 | select IRQ_DOMAIN |
895 | 895 | ||
896 | config X86_REROUTE_FOR_BROKEN_BOOT_IRQS | 896 | config X86_REROUTE_FOR_BROKEN_BOOT_IRQS |
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index 91a64d359d50..7a8f1c5e65af 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig | |||
@@ -67,7 +67,7 @@ config XEN_PCIDEV_FRONTEND | |||
67 | config HT_IRQ | 67 | config HT_IRQ |
68 | bool "Interrupts on hypertransport devices" | 68 | bool "Interrupts on hypertransport devices" |
69 | default y | 69 | default y |
70 | depends on PCI && X86_LOCAL_APIC && X86_IO_APIC | 70 | depends on PCI && X86_LOCAL_APIC |
71 | help | 71 | help |
72 | This allows native hypertransport devices to use interrupts. | 72 | This allows native hypertransport devices to use interrupts. |
73 | 73 | ||