From 9abe54104aec7b88ee54373f3f7813828dcf736e Mon Sep 17 00:00:00 2001
From: Becky Bruce <beckyb@kernel.crashing.org>
Date: Wed, 8 Apr 2009 09:09:16 -0500
Subject: [PATCH] --- yaml --- r: 145877 b: refs/heads/master c:
 67131ad0514d7105b55003a0506209cf1bba3f00 h: refs/heads/master i:   145875:
 7f6305c53bab6619ade95f4b46715762a381fb79 v: v3

---
 [refs]              | 2 +-
 trunk/lib/swiotlb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 834429df866f..9f3ac4254857 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ceb5ac3264686e75e6951de6a18d4baa9bdecb92
+refs/heads/master: 67131ad0514d7105b55003a0506209cf1bba3f00
diff --git a/trunk/lib/swiotlb.c b/trunk/lib/swiotlb.c
index 170cf56af6a9..4fd6a76e728c 100644
--- a/trunk/lib/swiotlb.c
+++ b/trunk/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),