Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddedec28 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tag-for-linus-3.8' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf 

Pull dma-buf updates from Sumit Semwal:
 "A fairly small dma-buf pull request for 3.8 - only 2 patches"

* tag 'tag-for-linus-3.8' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf:
  dma-buf: remove fallback for !CONFIG_DMA_SHARED_BUFFER
  dma-buf: might_sleep() in dma_buf_unmap_attachment()
parents 8cb68bdf ada65c74

drivers/base/dma-buf.c

+2 −0
Original line number Diff line number Diff line
@@ -298,6 +298,8 @@ void dma_buf_unmap_attachment(struct dma_buf_attachment *attach, 
				struct sg_table *sg_table,

				enum dma_data_direction direction)

{

	might_sleep();



	if (WARN_ON(!attach || !attach->dmabuf || !sg_table))

		return;

include/linux/dma-buf.h

+0 −99
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ static inline void get_dma_buf(struct dma_buf *dmabuf) 
	get_file(dmabuf->file);

}



#ifdef CONFIG_DMA_SHARED_BUFFER

struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf,

							struct device *dev);

void dma_buf_detach(struct dma_buf *dmabuf,
@@ -184,103 +183,5 @@ int dma_buf_mmap(struct dma_buf *, struct vm_area_struct *, 
		 unsigned long);

void *dma_buf_vmap(struct dma_buf *);

void dma_buf_vunmap(struct dma_buf *, void *vaddr);

#else



static inline struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf,

							struct device *dev)

{

	return ERR_PTR(-ENODEV);

}



static inline void dma_buf_detach(struct dma_buf *dmabuf,

				  struct dma_buf_attachment *dmabuf_attach)

{

	return;

}



static inline struct dma_buf *dma_buf_export(void *priv,

					     const struct dma_buf_ops *ops,

					     size_t size, int flags)

{

	return ERR_PTR(-ENODEV);

}



static inline int dma_buf_fd(struct dma_buf *dmabuf, int flags)

{

	return -ENODEV;

}



static inline struct dma_buf *dma_buf_get(int fd)

{

	return ERR_PTR(-ENODEV);

}



static inline void dma_buf_put(struct dma_buf *dmabuf)

{

	return;

}



static inline struct sg_table *dma_buf_map_attachment(

	struct dma_buf_attachment *attach, enum dma_data_direction write)

{

	return ERR_PTR(-ENODEV);

}



static inline void dma_buf_unmap_attachment(struct dma_buf_attachment *attach,

			struct sg_table *sg, enum dma_data_direction dir)

{

	return;

}



static inline int dma_buf_begin_cpu_access(struct dma_buf *dmabuf,

					   size_t start, size_t len,

					   enum dma_data_direction dir)

{

	return -ENODEV;

}



static inline void dma_buf_end_cpu_access(struct dma_buf *dmabuf,

					  size_t start, size_t len,

					  enum dma_data_direction dir)

{

}



static inline void *dma_buf_kmap_atomic(struct dma_buf *dmabuf,

					unsigned long pnum)

{

	return NULL;

}



static inline void dma_buf_kunmap_atomic(struct dma_buf *dmabuf,

					 unsigned long pnum, void *vaddr)

{

}



static inline void *dma_buf_kmap(struct dma_buf *dmabuf, unsigned long pnum)

{

	return NULL;

}



static inline void dma_buf_kunmap(struct dma_buf *dmabuf,

				  unsigned long pnum, void *vaddr)

{

}



static inline int dma_buf_mmap(struct dma_buf *dmabuf,

			       struct vm_area_struct *vma,

			       unsigned long pgoff)

{

	return -ENODEV;

}



static inline void *dma_buf_vmap(struct dma_buf *dmabuf)

{

	return NULL;

}



static inline void dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr)

{

}

#endif /* CONFIG_DMA_SHARED_BUFFER */



#endif /* __DMA_BUF_H__ */