diff --git a/[refs] b/[refs]
index 52db080cc2e9..a1661a4f8941 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc00a6274b786f6863b32c79ff6f92aa0960b789
+refs/heads/master: 18586e721636527cb5177467fb17e2350615978a
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 4107db0dc091..a5fb654ea590 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -3528,7 +3528,8 @@ int sched_setscheduler(struct task_struct *p, int policy, struct sched_param *pa
 	 */
 	if (!capable(CAP_SYS_NICE)) {
 		/* can't change policy */
-		if (policy != p->policy)
+		if (policy != p->policy &&
+			!p->signal->rlim[RLIMIT_RTPRIO].rlim_cur)
 			return -EPERM;
 		/* can't increase priority */
 		if (policy != SCHED_NORMAL &&