diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-04-20 12:04:26 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-04-20 12:04:26 -0400 |
| commit | cfec36d75b460843403c9e1392fddedf08288c9f (patch) | |
| tree | c2680c2627772aead51327fb3b21bf06ee66f72a /include/linux/dma-fence-array.h | |
| parent | 3b7c824e9330a640312fce1b04537c684c1d602c (diff) | |
| parent | b22a1fa1b34f17ef3a5cc6007e0705375de3d5dd (diff) | |
Merge remote-tracking branch 'linux-stable/linux-4.15.y' into bcachefs-buffered-io-2
Diffstat (limited to 'include/linux/dma-fence-array.h')
| -rw-r--r-- | include/linux/dma-fence-array.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/dma-fence-array.h b/include/linux/dma-fence-array.h index 332a5420243c..bc8940ca280d 100644 --- a/include/linux/dma-fence-array.h +++ b/include/linux/dma-fence-array.h @@ -21,6 +21,7 @@ #define __LINUX_DMA_FENCE_ARRAY_H #include <linux/dma-fence.h> +#include <linux/irq_work.h> /** * struct dma_fence_array_cb - callback helper for fence array @@ -47,6 +48,8 @@ struct dma_fence_array { unsigned num_fences; atomic_t num_pending; struct dma_fence **fences; + + struct irq_work work; }; extern const struct dma_fence_ops dma_fence_array_ops; |