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 <peterc@xxxxxxxxxxxxxxxxxx> --- arch/ia64/pci/pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6-import/arch/ia64/pci/pci.c =================================================================== --- linux-2.6-import.orig/arch/ia64/pci/pci.c 2006-12-05 11:22:00.273987854 +1100 +++ linux-2.6-import/arch/ia64/pci/pci.c 2006-12-05 11:58:12.832925655 +1100 @@ -564,8 +564,8 @@ pcibios_enable_device (struct pci_dev *d 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 - To unsubscribe from this list: send the line "unsubscribe linux-ia64" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
![]() |