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

From: Konrad Rzeszutek Wilk
Date: Tue Aug 05 2014 - 11:22:35 EST


On Tue, Aug 05, 2014 at 02:58:51PM +0200, Thierry Reding wrote:
> From: Thierry Reding <treding@xxxxxxxxxx>
>
> 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@xxxxxxxxxx>
> ---
> Alternatively rather than include linux/init.h for swiotlb_free() it
> should be possible to simply remove the annotation in the header since
> the implementation already has it and that's where it matters.

This is fine. Will queue it up for 3.17. Thanks!
>
> 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.0.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/