diff options
author | Becky Bruce <beckyb@kernel.crashing.org> | 2009-04-08 10:09:16 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-08 10:18:35 -0400 |
commit | 67131ad0514d7105b55003a0506209cf1bba3f00 (patch) | |
tree | 90eae2a0abf10029ec098b068b92db95feba6c50 | |
parent | ceb5ac3264686e75e6951de6a18d4baa9bdecb92 (diff) |
swiotlb: fix compile warning
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>
-rw-r--r-- | lib/swiotlb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/swiotlb.c b/lib/swiotlb.c index 170cf56af6a9..4fd6a76e728c 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, | |||
341 | unsigned long flags; | 341 | unsigned long flags; |
342 | 342 | ||
343 | while (size) { | 343 | while (size) { |
344 | sz = min(PAGE_SIZE - offset, size); | 344 | sz = min_t(size_t, PAGE_SIZE - offset, size); |
345 | 345 | ||
346 | local_irq_save(flags); | 346 | local_irq_save(flags); |
347 | buffer = kmap_atomic(pfn_to_page(pfn), | 347 | buffer = kmap_atomic(pfn_to_page(pfn), |