[tip:core/iommu] swiotlb: fix compile warning
From: Becky Bruce
Date: Wed Apr 08 2009 - 11:28:05 EST
Commit-ID: 67131ad0514d7105b55003a0506209cf1bba3f00
Gitweb: http://git.kernel.org/tip/67131ad0514d7105b55003a0506209cf1bba3f00
Author: Becky Bruce <beckyb@xxxxxxxxxxxxxxxxxxx>
AuthorDate: Wed, 8 Apr 2009 09:09:16 -0500
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Wed, 8 Apr 2009 16:18:35 +0200
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@xxxxxxxxxxxxxxxxxxx>
Acked-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Cc: jeremy@xxxxxxxx
Cc: ian.campbell@xxxxxxxxxx
LKML-Reference: <1239199761-22886-3-git-send-email-galak@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
lib/swiotlb.c | 2 +-
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),
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/