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 |
---|---|---|
aoe | ||
drbd | ||
mtip32xx | ||
paride | ||
rsxx | ||
xen-blkback | ||
zram | ||
DAC960.c | -rw-r--r-- | 259.7 KB |
DAC960.h | -rw-r--r-- | 148.2 KB |
Kconfig | -rw-r--r-- | 19.1 KB |
Makefile | -rw-r--r-- | 1.5 KB |
amiflop.c | -rw-r--r-- | 46.9 KB |
ataflop.c | -rw-r--r-- | 52.0 KB |
brd.c | -rw-r--r-- | 15.5 KB |
cciss.c | -rw-r--r-- | 148.7 KB |
cciss.h | -rw-r--r-- | 11.1 KB |
cciss_cmd.h | -rw-r--r-- | 7.3 KB |
cciss_scsi.c | -rw-r--r-- | 47.7 KB |
cciss_scsi.h | -rw-r--r-- | 3.0 KB |
cpqarray.c | -rw-r--r-- | 47.0 KB |
cpqarray.h | -rw-r--r-- | 3.0 KB |
cryptoloop.c | -rw-r--r-- | 4.9 KB |
floppy.c | -rw-r--r-- | 117.7 KB |
hd.c | -rw-r--r-- | 18.6 KB |
ida_cmd.h | -rw-r--r-- | 6.8 KB |
ida_ioctl.h | -rw-r--r-- | 2.6 KB |
loop.c | -rw-r--r-- | 47.2 KB |
loop.h | -rw-r--r-- | 2.1 KB |
mg_disk.c | -rw-r--r-- | 26.0 KB |
nbd.c | -rw-r--r-- | 22.4 KB |
null_blk.c | -rw-r--r-- | 14.2 KB |
nvme-core.c | -rw-r--r-- | 73.1 KB |
nvme-scsi.c | -rw-r--r-- | 82.9 KB |
osdblk.c | -rw-r--r-- | 15.6 KB |
pktcdvd.c | -rw-r--r-- | 73.9 KB |
ps3disk.c | -rw-r--r-- | 13.9 KB |
ps3vram.c | -rw-r--r-- | 22.0 KB |
rbd.c | -rw-r--r-- | 146.5 KB |
rbd_types.h | -rw-r--r-- | 1.9 KB |
skd_main.c | -rw-r--r-- | 138.3 KB |
skd_s1120.h | -rw-r--r-- | 9.6 KB |
smart1,2.h | -rw-r--r-- | 7.1 KB |
sunvdc.c | -rw-r--r-- | 25.4 KB |
swim.c | -rw-r--r-- | 19.8 KB |
swim3.c | -rw-r--r-- | 31.7 KB |
swim_asm.S | -rw-r--r-- | 4.6 KB |
sx8.c | -rw-r--r-- | 39.8 KB |
umem.c | -rw-r--r-- | 29.9 KB |
umem.h | -rw-r--r-- | 3.6 KB |
virtio_blk.c | -rw-r--r-- | 22.9 KB |
xen-blkfront.c | -rw-r--r-- | 55.5 KB |
xsysace.c | -rw-r--r-- | 32.6 KB |
z2ram.c | -rw-r--r-- | 9.1 KB |
Computing file changes ...