From 124dd924c27823727c5dac75e697f23780886f7e Mon Sep 17 00:00:00 2001
From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Date: Wed, 17 Mar 2010 09:36:58 +0900
Subject: [PATCH] --- yaml --- r: 189089 b: refs/heads/master c:
 8bc037fb89bb3104b9ae290d18c877624cd7d9cc h: refs/heads/master i:   189087:
 d32a58d4f9a87283b386a8ecf82909c4a6cdf252 v: v3

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

diff --git a/[refs] b/[refs]
index bebd4b72a948..2a8c7970d2c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c890692bf37671b5b78a1870d55d6d87e1c8a509
+refs/heads/master: 8bc037fb89bb3104b9ae290d18c877624cd7d9cc
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 82975b5b42f7..49d2fa7b687a 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -4912,7 +4912,7 @@ SYSCALL_DEFINE3(sched_getaffinity, pid_t, pid, unsigned int, len,
 
 	ret = sched_getaffinity(pid, mask);
 	if (ret == 0) {
-		int retlen = min(len, cpumask_size());
+		size_t retlen = min_t(size_t, len, cpumask_size());
 
 		if (copy_to_user(user_mask_ptr, mask, retlen))
 			ret = -EFAULT;