Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [MATH-EMU]: Fix underflow exception reporting.
  [SPARC64]: Create a HWCAP_SPARC_N2 and report it to userspace on Niagara-2.
  [SPARC64]: SMP trampoline needs to avoid %tick_cmpr on sun4v too.
  [SPARC64]: Do not touch %tick_cmpr on sun4v cpus.
  [SPARC64]: Niagara-2 optimized copies.
  [SPARC64]: Allow userspace to get at the machine description.
  [SPARC32]: Remove superfluous 'kernel_end' alignment on sun4c.
  [SPARC32]: Fix bogus ramdisk image location check.
  [SPARC32]: Remove iommu from struct sbus_bus and use archdata like sparc64.

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c
index be042efd1ba4..52e907af9d29 100644
--- a/arch/sparc/mm/iommu.c
+++ b/arch/sparc/mm/iommu.c
@@ -132,7 +132,7 @@ iommu_init(int iommund, struct sbus_bus *sbus)
             impl, vers, iommu->page_table,
             (int)(IOMMU_NPTES*sizeof(iopte_t)), (int)IOMMU_NPTES);
 
-        sbus->iommu = iommu;
+        sbus->ofdev.dev.archdata.iommu = iommu;
 }
 
 /* This begs to be btfixup-ed by srmmu. */
@@ -166,7 +166,7 @@ static void iommu_flush_iotlb(iopte_t *iopte, unsigned int niopte)
 
 static u32 iommu_get_one(struct page *page, int npages, struct sbus_bus *sbus)
 {
-        struct iommu_struct *iommu = sbus->iommu;
+        struct iommu_struct *iommu = sbus->ofdev.dev.archdata.iommu;
         int ioptex;
         iopte_t *iopte, *iopte0;
         unsigned int busa, busa0;
@@ -291,7 +291,7 @@ static void iommu_get_scsi_sgl_pflush(struct scatterlist *sg, int sz, struct sbu
 
 static void iommu_release_one(u32 busa, int npages, struct sbus_bus *sbus)
 {
-        struct iommu_struct *iommu = sbus->iommu;
+        struct iommu_struct *iommu = sbus->ofdev.dev.archdata.iommu;
         int ioptex;
         int i;
 
@@ -334,7 +334,7 @@ static int iommu_map_dma_area(dma_addr_t *pba, unsigned long va,
     unsigned long addr, int len)
 {
         unsigned long page, end;
-        struct iommu_struct *iommu = sbus_root->iommu;
+        struct iommu_struct *iommu = sbus_root->ofdev.dev.archdata.iommu;
         iopte_t *iopte = iommu->page_table;
         iopte_t *first;
         int ioptex;
@@ -399,7 +399,7 @@ static int iommu_map_dma_area(dma_addr_t *pba, unsigned long va,
 
 static void iommu_unmap_dma_area(unsigned long busa, int len)
 {
-        struct iommu_struct *iommu = sbus_root->iommu;
+        struct iommu_struct *iommu = sbus_root->ofdev.dev.archdata.iommu;
         iopte_t *iopte = iommu->page_table;
         unsigned long end;
         int ioptex = (busa - iommu->start) >> PAGE_SHIFT;
@@ -420,7 +420,7 @@ static void iommu_unmap_dma_area(unsigned long busa, int len)
 
 static struct page *iommu_translate_dvma(unsigned long busa)
 {
-        struct iommu_struct *iommu = sbus_root->iommu;
+        struct iommu_struct *iommu = sbus_root->ofdev.dev.archdata.iommu;
         iopte_t *iopte = iommu->page_table;
 
         iopte += ((busa - iommu->start) >> PAGE_SHIFT);