Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[mv-sheeva.git] / drivers / dma / ioat / dma_v2.h

diff --git a/drivers/dma/ioat/dma_v2.h b/drivers/dma/ioat/dma_v2.h
index fa030f8e1f27abb495bfe126ae1154d8fda99195..1d849ef74d5f7ff3a14bc7350ce58ce7d42be9c8 100644 (file)
--- a/drivers/dma/ioat/dma_v2.h
+++ b/drivers/dma/ioat/dma_v2.h
@@ -127,6 +127,7 @@ static inline u16 ioat2_xferlen_to_descs(struct ioat2_dma_chan *ioat, size_t len
  * @raw: hardware raw (un-typed) descriptor
  * @txd: the generic software descriptor for all engines
  * @len: total transaction length for unmap
+ * @result: asynchronous result of validate operations
  * @id: identifier for debug
  */
 
@@ -141,8 +142,9 @@ struct ioat_ring_ent {
                struct ioat_pq_update_descriptor *pqu;
                struct ioat_raw_descriptor *raw;
        };
-       struct dma_async_tx_descriptor txd;
        size_t len;
+       struct dma_async_tx_descriptor txd;
+       enum sum_check_flags *result;
        #ifdef DEBUG
        int id;
        #endif
@@ -180,5 +182,9 @@ enum dma_status ioat2_is_complete(struct dma_chan *c, dma_cookie_t cookie,
                                  dma_cookie_t *done, dma_cookie_t *used);
 void __ioat2_restart_chan(struct ioat2_dma_chan *ioat);
 bool reshape_ring(struct ioat2_dma_chan *ioat, int order);
+void __ioat2_issue_pending(struct ioat2_dma_chan *ioat);
+void ioat2_cleanup_tasklet(unsigned long data);
+void ioat2_timer_event(unsigned long data);
 extern struct kobj_type ioat2_ktype;
+extern struct kmem_cache *ioat2_cache;
 #endif /* IOATDMA_V2_H */