Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs

[~andy/linux] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index 82975b5b42f71441eb148e3eeaac4c29a5316e4c..49d2fa7b687a6cd9956e5d7179ab26822bcff6f1 100644 (file)
--- a/kernel/sched.c
+++ b/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;