[RESEND PATCH] swiotlb: Make linux/swiotlb.h standalone includible

[RESEND PATCH] swiotlb: Make linux/swiotlb.h standalone includible

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

This header file uses the enum dma_data_direction and struct page types
without explicitly including the corresponding header files. This makes
it rely on the includer to have included the proper headers before.

To fix this, include linux/dma-direction.h and forward-declare struct
page. The swiotlb_free() function is also annotated __init, therefore
requires linux/init.h to be included as well.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
Hi Konrad,

I sent this about a year ago and at the time you said you had queued it
up, but it never disappeared from my local stack of patches, so here it
is again.

Thierry

 include/linux/swiotlb.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index e7a018eaf3a2..017fced60242 100644
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -1,10 +1,13 @@
 #ifndef __LINUX_SWIOTLB_H
 #define __LINUX_SWIOTLB_H
 
+#include <linux/dma-direction.h>
+#include <linux/init.h>
 #include <linux/types.h>
 
 struct device;
 struct dma_attrs;
+struct page;
 struct scatterlist;
 
 extern int swiotlb_force;
-- 
2.4.1

Re: [RESEND PATCH] swiotlb: Make linux/swiotlb.h standalone includible

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 1383 bytes --]

On Wed, Jul 01, 2015 at 02:17:58PM +0200, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
> 
> This header file uses the enum dma_data_direction and struct page types
> without explicitly including the corresponding header files. This makes
> it rely on the includer to have included the proper headers before.
> 
> To fix this, include linux/dma-direction.h and forward-declare struct
> page. The swiotlb_free() function is also annotated __init, therefore
> requires linux/init.h to be included as well.
> 
> Signed-off-by: Thierry Reding <treding@nvidia.com>
> ---
> Hi Konrad,
> 
> I sent this about a year ago and at the time you said you had queued it
> up, but it never disappeared from my local stack of patches, so here it
> is again.
> 
> Thierry
> 
>  include/linux/swiotlb.h | 3 +++
>  1 file changed, 3 insertions(+)

Ping?

> 
> diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
> index e7a018eaf3a2..017fced60242 100644
> --- a/include/linux/swiotlb.h
> +++ b/include/linux/swiotlb.h
> @@ -1,10 +1,13 @@
>  #ifndef __LINUX_SWIOTLB_H
>  #define __LINUX_SWIOTLB_H
>  
> +#include <linux/dma-direction.h>
> +#include <linux/init.h>
>  #include <linux/types.h>
>  
>  struct device;
>  struct dma_attrs;
> +struct page;
>  struct scatterlist;
>  
>  extern int swiotlb_force;
> -- 
> 2.4.1
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]