aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJohn M. Calandrino <jmc@jupiter-cs.cs.unc.edu>2007-05-02 11:15:41 -0400
committerJohn M. Calandrino <jmc@jupiter-cs.cs.unc.edu>2007-05-02 11:15:41 -0400
commitaf47b4772ce86d29d941cff94dfd56526118e9a2 (patch)
tree0bda9141dd84105f05689331196ece8c1d17f16c /kernel
parenta3e766c20ddef351d5c4242e2eb9e1068a83ae66 (diff)
Fixed NULL pointer reference in gsnedf_inherit_priority.
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched_gsn_edf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched_gsn_edf.c b/kernel/sched_gsn_edf.c
index ca6699db22..29ec018149 100644
--- a/kernel/sched_gsn_edf.c
+++ b/kernel/sched_gsn_edf.c
@@ -540,7 +540,7 @@ static long gsnedf_inherit_priority(struct pi_semaphore *sem,
540 * not yet been determined. Need to also compare against your 540 * not yet been determined. Need to also compare against your
541 * own task priority! 541 * own task priority!
542 */ 542 */
543 if (!sem->holder->rt_param.inh_task) { 543 if (sem->holder && !sem->holder->rt_param.inh_task) {
544 sem->holder->rt_param.inh_task = sem->holder; 544 sem->holder->rt_param.inh_task = sem->holder;
545 if (sem->hp_sem_task && 545 if (sem->hp_sem_task &&
546 edf_higher_prio(sem->hp_sem_task, sem->holder)) { 546 edf_higher_prio(sem->hp_sem_task, sem->holder)) {