Merge branch 'linux-2.6' into for-2.6.24

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / pasemi / iommu.c

diff --git a/arch/powerpc/platforms/pasemi/iommu.c b/arch/powerpc/platforms/pasemi/iommu.c
index f33b21b9f5d4338d9ad9c01ba610a90250b7e132..6c42787fb38263659c0c43824ee60a5cf374402e 100644 (file)
--- a/arch/powerpc/platforms/pasemi/iommu.c
+++ b/arch/powerpc/platforms/pasemi/iommu.c
@@ -93,7 +93,7 @@ static void iobmap_build(struct iommu_table *tbl, long index,
 
        pr_debug("iobmap: build at: %lx, %lx, addr: %lx\n", index, npages, uaddr);
 
-       bus_addr = (tbl->it_offset + index) << PAGE_SHIFT;
+       bus_addr = (tbl->it_offset + index) << IOBMAP_PAGE_SHIFT;
 
        ip = ((u32 *)tbl->it_base) + index;
 
@@ -118,7 +118,7 @@ static void iobmap_free(struct iommu_table *tbl, long index,
 
        pr_debug("iobmap: free at: %lx, %lx\n", index, npages);
 
-       bus_addr = (tbl->it_offset + index) << PAGE_SHIFT;
+       bus_addr = (tbl->it_offset + index) << IOBMAP_PAGE_SHIFT;
 
        ip = ((u32 *)tbl->it_base) + index;
 
@@ -137,7 +137,7 @@ static void iommu_table_iobmap_setup(void)
        iommu_table_iobmap.it_busno = 0;
        iommu_table_iobmap.it_offset = 0;
        /* it_size is in number of entries */
-       iommu_table_iobmap.it_size = 0x80000000 >> PAGE_SHIFT;
+       iommu_table_iobmap.it_size = 0x80000000 >> IOBMAP_PAGE_SHIFT;
 
        /* Initialize the common IOMMU code */
        iommu_table_iobmap.it_base = (unsigned long)iob_l2_base;
@@ -187,7 +187,7 @@ static void pci_dma_dev_setup_pasemi(struct pci_dev *dev)
 static void pci_dma_bus_setup_null(struct pci_bus *b) { }
 static void pci_dma_dev_setup_null(struct pci_dev *d) { }
 
-int iob_init(struct device_node *dn)
+int __init iob_init(struct device_node *dn)
 {
        unsigned long tmp;
        u32 regword;
@@ -233,7 +233,7 @@ int iob_init(struct device_node *dn)
 
 
 /* These are called very early. */
-void iommu_init_early_pasemi(void)
+void __init iommu_init_early_pasemi(void)
 {
        int iommu_off;