diff options
Diffstat (limited to 'kernel/arch/ia64/sn')
| -rw-r--r-- | kernel/arch/ia64/sn/kernel/mca.c | 3 | ||||
| -rw-r--r-- | kernel/arch/ia64/sn/kernel/msi_sn.c | 4 | ||||
| -rw-r--r-- | kernel/arch/ia64/sn/pci/pci_dma.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/kernel/arch/ia64/sn/kernel/mca.c b/kernel/arch/ia64/sn/kernel/mca.c index 27793f7aa..5b799d4de 100644 --- a/kernel/arch/ia64/sn/kernel/mca.c +++ b/kernel/arch/ia64/sn/kernel/mca.c @@ -142,5 +142,4 @@ static int __init sn_salinfo_init(void) salinfo_platform_oemdata = &sn_salinfo_platform_oemdata; return 0; } - -module_init(sn_salinfo_init) +device_initcall(sn_salinfo_init); diff --git a/kernel/arch/ia64/sn/kernel/msi_sn.c b/kernel/arch/ia64/sn/kernel/msi_sn.c index a0eb27b66..fb25065b2 100644 --- a/kernel/arch/ia64/sn/kernel/msi_sn.c +++ b/kernel/arch/ia64/sn/kernel/msi_sn.c @@ -175,7 +175,7 @@ static int sn_set_msi_irq_affinity(struct irq_data *data, * Release XIO resources for the old MSI PCI address */ - __get_cached_msi_msg(data->msi_desc, &msg); + __get_cached_msi_msg(irq_data_get_msi_desc(data), &msg); sn_pdev = (struct pcidev_info *)sn_irq_info->irq_pciioinfo; pdev = sn_pdev->pdi_linux_pcidev; provider = SN_PCIDEV_BUSPROVIDER(pdev); @@ -206,7 +206,7 @@ static int sn_set_msi_irq_affinity(struct irq_data *data, msg.address_lo = (u32)(bus_addr & 0x00000000ffffffff); pci_write_msi_msg(irq, &msg); - cpumask_copy(data->affinity, cpu_mask); + cpumask_copy(irq_data_get_affinity_mask(data), cpu_mask); return 0; } diff --git a/kernel/arch/ia64/sn/pci/pci_dma.c b/kernel/arch/ia64/sn/pci/pci_dma.c index d0853e8e8..8f5990700 100644 --- a/kernel/arch/ia64/sn/pci/pci_dma.c +++ b/kernel/arch/ia64/sn/pci/pci_dma.c @@ -92,7 +92,7 @@ static void *sn_dma_alloc_coherent(struct device *dev, size_t size, */ node = pcibus_to_node(pdev->bus); if (likely(node >=0)) { - struct page *p = alloc_pages_exact_node(node, + struct page *p = __alloc_pages_node(node, flags, get_order(size)); if (likely(p)) |