linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] x86,swiotlb: Fix build warning after merge of the SWIOTLB bounce buffer adjustment patch
@ 2020-12-11  2:45 Ashish Kalra
  2020-12-11  3:25 ` Konrad Rzeszutek Wilk
  0 siblings, 1 reply; 2+ messages in thread
From: Ashish Kalra @ 2020-12-11  2:45 UTC (permalink / raw)
  To: konrad.wilk; +Cc: linux-kernel, linux-next, bp

From: Ashish Kalra <ashish.kalra@amd.com>

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

Signed-off-by: Ashish Kalra <ashish.kalra@amd.com>
---
 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


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] x86,swiotlb: Fix build warning after merge of the SWIOTLB bounce buffer adjustment patch
  2020-12-11  2:45 [PATCH] x86,swiotlb: Fix build warning after merge of the SWIOTLB bounce buffer adjustment patch Ashish Kalra
@ 2020-12-11  3:25 ` Konrad Rzeszutek Wilk
  0 siblings, 0 replies; 2+ messages in thread
From: Konrad Rzeszutek Wilk @ 2020-12-11  3:25 UTC (permalink / raw)
  To: Ashish Kalra; +Cc: linux-kernel, linux-next, bp

On Fri, Dec 11, 2020 at 02:45:33AM +0000, Ashish Kalra wrote:
> From: Ashish Kalra <ashish.kalra@amd.com>
> 
> 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 <ashish.kalra@amd.com>
> ---
>  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
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-12-11  3:25 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-11  2:45 [PATCH] x86,swiotlb: Fix build warning after merge of the SWIOTLB bounce buffer adjustment patch Ashish Kalra
2020-12-11  3:25 ` Konrad Rzeszutek Wilk

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).