aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern Brandenburg <bbb@mpi-sws.org>2014-09-17 03:44:03 -0400
committerBjoern Brandenburg <bbb@mpi-sws.org>2014-09-17 03:44:03 -0400
commit2ee430a8890c83d30250cc7cd30ea42e5c7ead6a (patch)
treea93114902411a2438c372737bb38c87cab0a192f
parent90bbb7e232106fd2a30a410509ce6e531c4ee6ba (diff)
P-RES: allocation in pres_admit_task() must be atomic
The kernel codepath calling into pres_admit_task() is holding some lock unrelated to LITMUS^RT. As a result, we need to pass GFP_ATOMIC, not just GFP_KERNEL, to kzalloc().
-rw-r--r--litmus/sched_pres.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/litmus/sched_pres.c b/litmus/sched_pres.c
index 13a47a831794..49648ee9bfbc 100644
--- a/litmus/sched_pres.c
+++ b/litmus/sched_pres.c
@@ -264,7 +264,7 @@ static long pres_admit_task(struct task_struct *tsk)
264 unsigned long flags; 264 unsigned long flags;
265 struct reservation *res; 265 struct reservation *res;
266 struct pres_cpu_state *state; 266 struct pres_cpu_state *state;
267 struct pres_task_state *tinfo = kzalloc(sizeof(*tinfo), GFP_KERNEL); 267 struct pres_task_state *tinfo = kzalloc(sizeof(*tinfo), GFP_ATOMIC);
268 268
269 if (!tinfo) 269 if (!tinfo)
270 return -ENOMEM; 270 return -ENOMEM;