diff --git a/[refs] b/[refs]
index 3340daa5b3dd..44f736a5504c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9dc29e72fd3dc2a739ce8eafd958220d0745734
+refs/heads/master: 6c697bdf08a09ce461e305a22362973036e95db3
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 50e4e3d15e83..34f94240642f 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -2627,6 +2627,11 @@ void sched_fork(struct task_struct *p, int clone_flags)
 		if (p->normal_prio < DEFAULT_PRIO)
 			p->prio = DEFAULT_PRIO;
 
+		if (PRIO_TO_NICE(p->static_prio) < 0) {
+			p->static_prio = NICE_TO_PRIO(0);
+			set_load_weight(p);
+		}
+
 		/*
 		 * We don't need the reset flag anymore after the fork. It has
 		 * fulfilled its duty: