---

yaml --- r: 288755 b: refs/heads/master c: 3c7d518 h: refs/heads/master i: 288753: 9534b0c 288751: b9a20c8 v: v3
git-mirror · Mar 1, 2012 · 3738c89 · 3738c89
1 parent 6ada2c9
commit 3738c89
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c4dd99bed5f6f70932bf8dacdd54d04a2619778
+refs/heads/master: 3c7d51843b03a6839e9ec7cda724e54d2319a63a
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
@@ -2082,12 +2082,20 @@ extern unsigned int sysctl_sched_cfs_bandwidth_slice;
 extern int rt_mutex_getprio(struct task_struct *p);
 extern void rt_mutex_setprio(struct task_struct *p, int prio);
 extern void rt_mutex_adjust_pi(struct task_struct *p);
+static inline bool tsk_is_pi_blocked(struct task_struct *tsk)
+{
+	return tsk->pi_blocked_on != NULL;
+}
 #else
 static inline int rt_mutex_getprio(struct task_struct *p)
 {
 	return p->normal_prio;
 }
 # define rt_mutex_adjust_pi(p)		do { } while (0)
+static inline bool tsk_is_pi_blocked(struct task_struct *tsk)
+{
+	return false;
+}
 #endif
 
 extern bool yield_to(struct task_struct *p, bool preempt);

diff --git a/trunk/kernel/sched/core.c b/trunk/kernel/sched/core.c
@@ -3227,7 +3227,7 @@ static void __sched __schedule(void)
 
 static inline void sched_submit_work(struct task_struct *tsk)
 {
-	if (!tsk->state)
+	if (!tsk->state || tsk_is_pi_blocked(tsk))
 		return;
 	/*
 	 * If we are going to sleep and we have plugged IO queued,