diff --git a/[refs] b/[refs]
index be5f2b7443e5..539e0b53505a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 147b31cf09ee493aa71c87c0dd2eef74b6b2aeba
+refs/heads/master: c21761f168894b356626c847fe13be39605d76b4
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 788ecce1e0e4..3ee2ae45125f 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -3850,6 +3850,10 @@ do_sched_setscheduler(pid_t pid, int policy, struct sched_param __user *param)
 asmlinkage long sys_sched_setscheduler(pid_t pid, int policy,
 				       struct sched_param __user *param)
 {
+	/* negative values for policy are not valid */
+	if (policy < 0)
+		return -EINVAL;
+
 	return do_sched_setscheduler(pid, policy, param);
 }