jbd,jbd2: fix oops in jbd2_journal_put_journal_head()

[platform/adaptation/renesas_rcar/renesas_kernel.git] / include / linux / dma-buf.h

diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
index bd2e52c..9978b61 100644 (file)
--- a/include/linux/dma-buf.h
+++ b/include/linux/dma-buf.h
@@ -53,7 +53,7 @@ struct dma_buf_attachment;
  * @begin_cpu_access: [optional] called before cpu access to invalidate cpu
  *                   caches and allocate backing storage (if not yet done)
  *                   respectively pin the objet into memory.
- * @end_cpu_access: [optional] called after cpu access to flush cashes.
+ * @end_cpu_access: [optional] called after cpu access to flush caches.
  * @kmap_atomic: maps a page from the buffer into kernel address
  *              space, users may not block until the subsequent unmap call.
  *              This callback must not sleep.
@@ -119,8 +119,10 @@ struct dma_buf {
        struct file *file;
        struct list_head attachments;
        const struct dma_buf_ops *ops;
-       /* mutex to serialize list manipulation and attach/detach */
+       /* mutex to serialize list manipulation, attach/detach and vmap/unmap */
        struct mutex lock;
+       unsigned vmapping_counter;
+       void *vmap_ptr;
        void *priv;
 };