Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[linux-2.6-omap-h63xx.git] / arch / sparc64 / kernel / pci_sabre.c

diff --git a/arch/sparc64/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c
index fba67c3d880928e00d9332e9f1e5099f26d5171b..4c34195baf37f5e675dabb35986edb61e4a590da 100644 (file)
--- a/arch/sparc64/kernel/pci_sabre.c
+++ b/arch/sparc64/kernel/pci_sabre.c
@@ -633,7 +633,7 @@ static void apb_init(struct pci_bus *sabre_bus)
        }
 }
 
-static void sabre_scan_bus(struct pci_pbm_info *pbm)
+static void __init sabre_scan_bus(struct pci_pbm_info *pbm)
 {
        static int once;
 
@@ -704,7 +704,7 @@ static int sabre_iommu_init(struct pci_pbm_info *pbm,
         * in pci_iommu.c
         */
        err = iommu_table_init(iommu, tsbsize * 1024 * 8,
-                              dvma_offset, dma_mask);
+                              dvma_offset, dma_mask, pbm->numa_node);
        if (err)
                return err;
 
@@ -731,11 +731,14 @@ static int sabre_iommu_init(struct pci_pbm_info *pbm,
        return 0;
 }
 
-static void sabre_pbm_init(struct pci_controller_info *p, struct pci_pbm_info *pbm, struct device_node *dp)
+static void __init sabre_pbm_init(struct pci_controller_info *p,
+                                 struct pci_pbm_info *pbm, struct device_node *dp)
 {
        pbm->name = dp->full_name;
        printk("%s: SABRE PCI Bus Module\n", pbm->name);
 
+       pbm->numa_node = -1;
+
        pbm->scan_bus = sabre_scan_bus;
        pbm->pci_ops = &sun4u_pci_ops;
        pbm->config_space_reg_bits = 8;
@@ -750,7 +753,7 @@ static void sabre_pbm_init(struct pci_controller_info *p, struct pci_pbm_info *p
        pci_determine_mem_io_space(pbm);
 }
 
-void sabre_init(struct device_node *dp, char *model_name)
+void __init sabre_init(struct device_node *dp, char *model_name)
 {
        const struct linux_prom64_registers *pr_regs;
        struct pci_controller_info *p;