]> err.no Git - linux-2.6/commit
POWERPC: Set dma_data correctly for direct_ops on pasemi
authorOlof Johansson <olof@lixom.net>
Thu, 31 Jan 2008 06:41:30 +0000 (00:41 -0600)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Jan 2008 08:59:44 +0000 (19:59 +1100)
commit24af8cb86973dde9bf8df51bef923fda8718bdb5
tree984e150e7160ac027b9c77651e98f614811cf273
parent8af03e782cae1e0a0f530ddd22301cdd12cf9dc0
POWERPC: Set dma_data correctly for direct_ops on pasemi

More late-caught fallout from the mainline merge.  Commit
35e4a6e26d0c6bc7f32087db61f0fb3666531183 ("[POWERPC] Use
archdata.dma_data in dma_direct_ops and add the offset") claimed

  "Now that all platforms using dma_direct_offset setup the
   archdata.dma_data correctly, ..."

..but nope -- the pasemi iommu setup code that disables translation on
the DMA pci device didn't set dma_data correctly.

This fixes it.

Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/powerpc/platforms/pasemi/iommu.c