Revision 38a1dfda8e77d7ba74c94d06d8bc41ba98a4bc8c authored by Bryan O'Donoghue on 22 January 2015, 22:58:49 UTC, committed by Thomas Gleixner on 23 January 2015, 09:20:30 UTC
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>
1 parent 31bb772
File | Mode | Size |
---|---|---|
Kconfig | -rw-r--r-- | 514 bytes |
Makefile | -rw-r--r-- | 65 bytes |
ntb_hw.c | -rw-r--r-- | 50.0 KB |
ntb_hw.h | -rw-r--r-- | 7.9 KB |
ntb_regs.h | -rw-r--r-- | 6.3 KB |
ntb_transport.c | -rw-r--r-- | 44.6 KB |
Computing file changes ...