2020-12-11 11:36:27

by Kalra, Ashish

Subject: [PATCH] x86,swiotlb: Fix build warning after merge of the SWIOTLB bounce buffer adjustment patch

From: Ashish Kalra <[email protected]>

Need to add "inline" to swiotlb_adjust_size() when
CONFIG_SWIOTLB is not defined.

Signed-off-by: Ashish Kalra <[email protected]>
---
include/linux/swiotlb.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index 075748f367ea..e8074ff1b8c7 100644
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -104,7 +104,7 @@ static inline bool is_swiotlb_active(void)
return false;
}

-static void swiotlb_adjust_size(unsigned long new_size)
+static inline void swiotlb_adjust_size(unsigned long new_size)
{
}
#endif /* CONFIG_SWIOTLB */
--
2.17.1

2020-12-11 11:41:03

by Konrad Rzeszutek Wilk

Subject: Re: [PATCH] x86,swiotlb: Fix build warning after merge of the SWIOTLB bounce buffer adjustment patch

On Fri, Dec 11, 2020 at 02:45:33AM +0000, Ashish Kalra wrote:
> From: Ashish Kalra <[email protected]>
>
> Need to add "inline" to swiotlb_adjust_size() when
> CONFIG_SWIOTLB is not defined.

I am just going to squash that in. Thanks.
>
> Signed-off-by: Ashish Kalra <[email protected]>
> ---
> include/linux/swiotlb.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
> index 075748f367ea..e8074ff1b8c7 100644
> --- a/include/linux/swiotlb.h
> +++ b/include/linux/swiotlb.h
> @@ -104,7 +104,7 @@ static inline bool is_swiotlb_active(void)
> return false;
> }
>
> -static void swiotlb_adjust_size(unsigned long new_size)
> +static inline void swiotlb_adjust_size(unsigned long new_size)
> {
> }
> #endif /* CONFIG_SWIOTLB */
> --
> 2.17.1
>