linux-kernel - Re: [PATCH 2/5] swiotlb: fix compile warning

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 25 Mar 2009 11:58:23 +0900
From:	FUJITA Tomonori <fujita.tomonori@....ntt.co.jp>
To:	beckyb@...nel.crashing.org
Cc:	linux-kernel@...r.kernel.org, mingo@...e.hu,
	fujita.tomonori@....ntt.co.jp, ian.campbell@...rix.com,
	jeremy@...p.org
Subject: Re: [PATCH 2/5] swiotlb: fix compile warning

On Tue, 24 Mar 2009 16:28:43 -0500
Becky Bruce <beckyb@...nel.crashing.org> wrote:

> Squash a build warning seen on 32-bit powerpc caused by calling min()
> with 2 different types.  Cast the first arg to size_t, which is the
> type of the second, and should be portable across architectures.
> 
> Signed-off-by: Becky Bruce <beckyb@...nel.crashing.org>
> ---
>  lib/swiotlb.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/lib/swiotlb.c b/lib/swiotlb.c
> index f59cf30..62f5f75 100644
> --- a/lib/swiotlb.c
> +++ b/lib/swiotlb.c
> @@ -341,7 +341,7 @@ static void swiotlb_bounce(phys_addr_t phys, char *dma_addr, size_t size,
>  		unsigned long flags;
>  
>  		while (size) {
> -			sz = min(PAGE_SIZE - offset, size);
> +			sz = min((size_t)(PAGE_SIZE - offset), size);
>  
>  			local_irq_save(flags);
>  			buffer = kmap_atomic(pfn_to_page(pfn),

?

diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index f59cf30..fa62498 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -341,7 +341,7 @@ static void swiotlb_bounce(phys_addr_t phys, char *dma_addr, size_t size,
 		unsigned long flags;
 
 		while (size) {
-			sz = min(PAGE_SIZE - offset, size);
+			sz = min_t(size_t, PAGE_SIZE - offset, size);
 
 			local_irq_save(flags);
 			buffer = kmap_atomic(pfn_to_page(pfn),
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/