[PATCH] mm: remove atomic

[linux-2.6] / include / asm-ia64 / sn / pcibr_provider.h

diff --git a/include/asm-ia64/sn/pcibr_provider.h b/include/asm-ia64/sn/pcibr_provider.h
index 2299c3ad2e3336dadbe87ab52f3c1dcc239f9150..2b42d9ece26b12dd2302421902abd7a487eb296c 100644 (file)
--- a/include/asm-ia64/sn/pcibr_provider.h
+++ b/include/asm-ia64/sn/pcibr_provider.h
@@ -108,10 +108,11 @@ struct pcibus_info {
        char                    pbi_hub_xid;
 
        uint64_t                pbi_devreg[8];
-       spinlock_t              pbi_lock;
 
        uint32_t                pbi_valid_devices;
        uint32_t                pbi_enabled_devices;
+
+       spinlock_t              pbi_lock;
 };
 
 /*
@@ -127,7 +128,7 @@ pcibr_lock(struct pcibus_info *pcibus_info)
 #define pcibr_unlock(pcibus_info, flag)  spin_unlock_irqrestore(&pcibus_info->pbi_lock, flag)
 
 extern int  pcibr_init_provider(void);
-extern void *pcibr_bus_fixup(struct pcibus_bussoft *);
+extern void *pcibr_bus_fixup(struct pcibus_bussoft *, struct pci_controller *);
 extern dma_addr_t pcibr_dma_map(struct pci_dev *, unsigned long, size_t);
 extern dma_addr_t pcibr_dma_map_consistent(struct pci_dev *, unsigned long, size_t);
 extern void pcibr_dma_unmap(struct pci_dev *, dma_addr_t, int);