diff options
| author | Bryan O'Donoghue <pure.logic@nexus-software.ie> | 2015-01-22 22:58:49 +0000 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-01-23 10:20:30 +0100 |
| commit | 38a1dfda8e77d7ba74c94d06d8bc41ba98a4bc8c (patch) | |
| tree | e6465996a103385b228f6f655770180b13118273 /firmware | |
| 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>
Diffstat (limited to 'firmware')
0 files changed, 0 insertions, 0 deletions