diff options
| author | Bryan O'Donoghue <pure.logic@nexus-software.ie> | 2015-01-22 17:58:49 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-01-23 04:20:30 -0500 |
| commit | 38a1dfda8e77d7ba74c94d06d8bc41ba98a4bc8c (patch) | |
| tree | e6465996a103385b228f6f655770180b13118273 | |
| parent | 31bb7723706ba9660504a6c3903ea46198f98fd1 (diff) | |
x86/apic: Re-enable PCI_MSI support for non-SMP X86_32
Commit 0dbc6078c06bc0 ('x86, build, pci: Fix PCI_MSI build on !SMP')
introduced the dependency that X86_UP_APIC is only available when
PCI_MSI is false. This effectively prevents PCI_MSI support on 32bit
UP systems because it disables both APIC and IO-APIC. But APIC support
is architecturally required for PCI_MSI.
The intention of the patch was to enforce APIC support when PCI_MSI is
enabled, but failed to do so.
Remove the !PCI_MSI dependency from X86_UP_APIC and enforce
X86_UP_APIC when PCI_MSI support is enabled on 32bit UP systems.
[ tglx: Massaged changelog ]
Fixes 0dbc6078c06bc0 'x86, build, pci: Fix PCI_MSI build on !SMP'
Signed-off-by: Bryan O'Donoghue <pure.logic@nexus-software.ie>
Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/1421967529-9037-1-git-send-email-pure.logic@nexus-software.ie
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/x86/Kconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index ba397bde7948..0dc9d0144a27 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -857,7 +857,7 @@ source "kernel/Kconfig.preempt" | |||
| 857 | 857 | ||
| 858 | config X86_UP_APIC | 858 | config X86_UP_APIC |
| 859 | bool "Local APIC support on uniprocessors" | 859 | bool "Local APIC support on uniprocessors" |
| 860 | depends on X86_32 && !SMP && !X86_32_NON_STANDARD && !PCI_MSI | 860 | depends on X86_32 && !SMP && !X86_32_NON_STANDARD |
| 861 | ---help--- | 861 | ---help--- |
| 862 | A local APIC (Advanced Programmable Interrupt Controller) is an | 862 | A local APIC (Advanced Programmable Interrupt Controller) is an |
| 863 | integrated interrupt controller in the CPU. If you have a single-CPU | 863 | integrated interrupt controller in the CPU. If you have a single-CPU |
| @@ -868,6 +868,10 @@ config X86_UP_APIC | |||
| 868 | performance counters), and the NMI watchdog which detects hard | 868 | performance counters), and the NMI watchdog which detects hard |
| 869 | lockups. | 869 | lockups. |
| 870 | 870 | ||
| 871 | config X86_UP_APIC_MSI | ||
| 872 | def_bool y | ||
| 873 | select X86_UP_APIC if X86_32 && !SMP && !X86_32_NON_STANDARD && PCI_MSI | ||
| 874 | |||
| 871 | config X86_UP_IOAPIC | 875 | config X86_UP_IOAPIC |
| 872 | bool "IO-APIC support on uniprocessors" | 876 | bool "IO-APIC support on uniprocessors" |
| 873 | depends on X86_UP_APIC | 877 | depends on X86_UP_APIC |