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 |
---|---|---|
avs | ||
reset | ||
88pm860x_battery.c | -rw-r--r-- | 25.7 KB |
88pm860x_charger.c | -rw-r--r-- | 18.5 KB |
Kconfig | -rw-r--r-- | 11.3 KB |
Makefile | -rw-r--r-- | 2.8 KB |
ab8500_bmdata.c | -rw-r--r-- | 16.5 KB |
ab8500_btemp.c | -rw-r--r-- | 32.0 KB |
ab8500_charger.c | -rw-r--r-- | 101.8 KB |
ab8500_fg.c | -rw-r--r-- | 83.5 KB |
abx500_chargalg.c | -rw-r--r-- | 60.6 KB |
apm_power.c | -rw-r--r-- | 10.1 KB |
bq2415x_charger.c | -rw-r--r-- | 44.3 KB |
bq24190_charger.c | -rw-r--r-- | 40.5 KB |
bq24735-charger.c | -rw-r--r-- | 10.2 KB |
bq27x00_battery.c | -rw-r--r-- | 25.7 KB |
charger-manager.c | -rw-r--r-- | 56.7 KB |
collie_battery.c | -rw-r--r-- | 9.2 KB |
da9030_battery.c | -rw-r--r-- | 15.7 KB |
da9052-battery.c | -rw-r--r-- | 15.2 KB |
ds2760_battery.c | -rw-r--r-- | 17.9 KB |
ds2780_battery.c | -rw-r--r-- | 20.9 KB |
ds2781_battery.c | -rw-r--r-- | 20.6 KB |
ds2782_battery.c | -rw-r--r-- | 10.7 KB |
generic-adc-battery.c | -rw-r--r-- | 10.7 KB |
goldfish_battery.c | -rw-r--r-- | 6.1 KB |
gpio-charger.c | -rw-r--r-- | 7.1 KB |
intel_mid_battery.c | -rw-r--r-- | 21.1 KB |
ipaq_micro_battery.c | -rw-r--r-- | 7.4 KB |
isp1704_charger.c | -rw-r--r-- | 13.5 KB |
jz4740-battery.c | -rw-r--r-- | 10.1 KB |
lp8727_charger.c | -rw-r--r-- | 14.0 KB |
lp8788-charger.c | -rw-r--r-- | 18.1 KB |
max14577_charger.c | -rw-r--r-- | 16.0 KB |
max17040_battery.c | -rw-r--r-- | 7.0 KB |
max17042_battery.c | -rw-r--r-- | 22.6 KB |
max8903_charger.c | -rw-r--r-- | 9.0 KB |
max8925_power.c | -rw-r--r-- | 14.8 KB |
max8997_charger.c | -rw-r--r-- | 5.2 KB |
max8998_charger.c | -rw-r--r-- | 5.6 KB |
olpc_battery.c | -rw-r--r-- | 16.2 KB |
pcf50633-charger.c | -rw-r--r-- | 12.4 KB |
pda_power.c | -rw-r--r-- | 11.5 KB |
pm2301_charger.c | -rw-r--r-- | 29.7 KB |
pm2301_charger.h | -rw-r--r-- | 13.8 KB |
pmu_battery.c | -rw-r--r-- | 5.3 KB |
power_supply.h | -rw-r--r-- | 1.1 KB |
power_supply_core.c | -rw-r--r-- | 15.5 KB |
power_supply_leds.c | -rw-r--r-- | 4.7 KB |
power_supply_sysfs.c | -rw-r--r-- | 9.0 KB |
rx51_battery.c | -rw-r--r-- | 7.8 KB |
s3c_adc_battery.c | -rw-r--r-- | 11.1 KB |
sbs-battery.c | -rw-r--r-- | 24.2 KB |
smb347-charger.c | -rw-r--r-- | 31.7 KB |
test_power.c | -rw-r--r-- | 13.5 KB |
tosa_battery.c | -rw-r--r-- | 11.1 KB |
tps65090-charger.c | -rw-r--r-- | 8.9 KB |
twl4030_charger.c | -rw-r--r-- | 17.6 KB |
twl4030_madc_battery.c | -rw-r--r-- | 6.4 KB |
wm831x_backup.c | -rw-r--r-- | 5.4 KB |
wm831x_power.c | -rw-r--r-- | 17.1 KB |
wm8350_power.c | -rw-r--r-- | 14.7 KB |
wm97xx_battery.c | -rw-r--r-- | 7.1 KB |
z2_battery.c | -rw-r--r-- | 7.8 KB |
Computing file changes ...