From: Peter Chubb Date: Tue, 5 Dec 2006 01:25:31 +0000 (+1100) Subject: [IA64] Fix pci.c kernel compilation breakage. X-Git-Tag: v2.6.20-rc1~34^2~20^2~24^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c7f570a5eca59575572ee231390df727df207bda;p=linux-2.6-omap-h63xx.git [IA64] Fix pci.c kernel compilation breakage. The recent change to convert the is_enabled flag in the PCI device to an atomic count broke the IA64 compilation. As pcibios_disable_device is only ever called if the reference count is zero, convert the if to a BUG_ON. Signed-off-by: Peter Chubb Signed-off-by: Tony Luck --- diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index f4edfbf2713..eb92cef9cd0 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c @@ -564,8 +564,8 @@ pcibios_enable_device (struct pci_dev *dev, int mask) void pcibios_disable_device (struct pci_dev *dev) { - if (dev->is_enabled) - acpi_pci_irq_disable(dev); + BUG_ON(atomic_read(&dev->enable_cnt)); + acpi_pci_irq_disable(dev); } void