]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
swiotlb: fix compile warning
authorBecky Bruce <beckyb@kernel.crashing.org>
Wed, 8 Apr 2009 14:09:16 +0000 (09:09 -0500)
committerIngo Molnar <mingo@elte.hu>
Wed, 8 Apr 2009 14:18:35 +0000 (16:18 +0200)
Squash a build warning seen on 32-bit powerpc caused by
calling min() with 2 different types. Use min_t() instead.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Cc: jeremy@goop.org
Cc: ian.campbell@citrix.com
LKML-Reference: <1239199761-22886-3-git-send-email-galak@kernel.crashing.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
lib/swiotlb.c

index 170cf56af6a99b00fd1f6808d807a59a7fd24a58..4fd6a76e728c17dd0ce5e45ddfa2f6e353f14b55 100644 (file)
@@ -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),