From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Apr 2012 22:30:16 +0000 (-0700)
Subject: Merge tag 'dmaengine-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw... 
X-Git-Url: http://git.alex.org.uk

Merge tag 'dmaengine-fixes' of git://git./linux/kernel/git/djbw/dmaengine

Pull dmaengine fixes from Dan Williams:

1/ regression fix for Xen as it now trips over a broken assumption
   about the dma address size on 32-bit builds

2/ new quirk for netdma to ignore dma channels that cannot meet
   netdma alignment requirements

3/ fixes for two long standing issues in ioatdma (ring size overflow)
   and iop-adma (potential stack corruption)

* tag 'dmaengine-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine:
  netdma: adding alignment check for NETDMA ops
  ioatdma: DMA copy alignment needed to address IOAT DMA silicon errata
  ioat: ring size variables need to be 32bit to avoid overflow
  iop-adma: Corrected array overflow in RAID6 Xscale(R) test.
  ioat: fix size of 'completion' for Xen
---

94fb175c0414902ad9dbd956addf3a5feafbc85b
diff --cc drivers/dma/ioat/dma.h
index c7888bc,8bebddd..5e8fe01
--- a/drivers/dma/ioat/dma.h
+++ b/drivers/dma/ioat/dma.h
@@@ -88,8 -88,9 +88,8 @@@ struct ioatdma_device 
  struct ioat_chan_common {
  	struct dma_chan common;
  	void __iomem *reg_base;
- 	unsigned long last_completion;
+ 	dma_addr_t last_completion;
  	spinlock_t cleanup_lock;
 -	dma_cookie_t completed_cookie;
  	unsigned long state;
  	#define IOAT_COMPLETION_PENDING 0
  	#define IOAT_COMPLETION_ACK 1