diff --git a/[refs] b/[refs]
index cae1c6429442..1b5ade4d1285 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 150d8bede7f85eb00d8f4d628e6b0bae68739e3b
+refs/heads/master: 1868f958eb56fc41c5985c8732e564a400c5fdf5
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 63a469f8853d..5b13e4b0e009 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -5100,7 +5100,7 @@ long sys_sched_rr_get_interval(pid_t pid, struct timespec __user *interval)
 	time_slice = 0;
 	if (p->policy == SCHED_RR) {
 		time_slice = DEF_TIMESLICE;
-	} else {
+	} else if (p->policy != SCHED_FIFO) {
 		struct sched_entity *se = &p->se;
 		unsigned long flags;
 		struct rq *rq;