patch-2.4.10 linux/drivers/s390/net/iucv.c

• Lines: 18
• Date: Mon Sep 10 09:04:53 2001
• Orig file: v2.4.9/linux/drivers/s390/net/iucv.c
• Orig date: Mon Aug 27 12:41:44 2001

diff -u --recursive --new-file v2.4.9/linux/drivers/s390/net/iucv.c linux/drivers/s390/net/iucv.c
@@ -1309,7 +1309,7 @@
 			if (residual_buffer)
 				*residual_buffer = parm.ipbfadr1;
 		} else {
-			moved = min(unsigned int, buflen, 8);
+			moved = min_t(unsigned int, buflen, 8);
 
 			memcpy ((char *) buffer,
 				(char *) &parm.ipbfadr1, moved);
@@ -1402,7 +1402,7 @@
 
 			while ((moved < 8) && (moved < buflen)) {
 				dyn_len =
-				    min(unsigned int,
+				    min_t(unsigned int,
 					(buffer + i)->length, need_to_move);
 
 				memcpy ((char *)((ulong)((buffer + i)->address)),