summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBecky Bruce <beckyb@kernel.crashing.org>2009-04-08 09:09:16 -0500
committerIngo Molnar <mingo@elte.hu>2009-04-08 16:18:35 +0200
commit67131ad0514d7105b55003a0506209cf1bba3f00 (patch)
tree90eae2a0abf10029ec098b068b92db95feba6c50
parentceb5ac3264686e75e6951de6a18d4baa9bdecb92 (diff)
downloadop-kernel-dev-67131ad0514d7105b55003a0506209cf1bba3f00.zip
op-kernel-dev-67131ad0514d7105b55003a0506209cf1bba3f00.tar.gz
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 170cf56..4fd6a76 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),
OpenPOWER on IntegriCloud